8019809: return after break incorrectly sets the block as terminal
Reviewed-by: jlaskey, lagergren
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 013564c..880fea6 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.ListIterator;
import jdk.nashorn.internal.ir.BaseNode;
import jdk.nashorn.internal.ir.BinaryNode;
import jdk.nashorn.internal.ir.Block;
@@ -115,6 +116,21 @@
}
return newStatements;
}
+
+ @Override
+ protected Block afterSetStatements(final Block block) {
+ final List<Statement> stmts = block.getStatements();
+ for(final ListIterator<Statement> li = stmts.listIterator(stmts.size()); li.hasPrevious();) {
+ final Statement stmt = li.previous();
+ // popStatements() guarantees that the only thing after a terminal statement are uninitialized
+ // VarNodes. We skip past those, and set the terminal state of the block to the value of the
+ // terminal state of the first statement that is not an uninitialized VarNode.
+ if(!(stmt instanceof VarNode && ((VarNode)stmt).getInit() == null)) {
+ return block.setIsTerminal(this, stmt.isTerminal());
+ }
+ }
+ return block.setIsTerminal(this, false);
+ }
});
}
@@ -132,11 +148,11 @@
//now we have committed the entire statement list to the block, but we need to truncate
//whatever is after the last terminal. block append won't append past it
- Statement last = lc.getLastStatement();
if (lc.isFunctionBody()) {
final FunctionNode currentFunction = lc.getCurrentFunction();
final boolean isProgram = currentFunction.isProgram();
+ final Statement last = lc.getLastStatement();
final ReturnNode returnNode = new ReturnNode(
last == null ? block.getLineNumber() : last.getLineNumber(), //TODO?
currentFunction.getToken(),
@@ -145,11 +161,7 @@
compilerConstant(RETURN) :
LiteralNode.newInstance(block, ScriptRuntime.UNDEFINED));
- last = (Statement)returnNode.accept(this);
- }
-
- if (last != null && last.isTerminal()) {
- return block.setIsTerminal(lc, true);
+ returnNode.accept(this);
}
return block;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java b/nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java
index 71c80a6..8fecddd 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java
@@ -29,7 +29,6 @@
import java.util.ArrayList;
import java.util.Deque;
import java.util.List;
-import java.util.ListIterator;
/**
* This is a subclass of lexical context used for filling
@@ -63,6 +62,16 @@
return sstack.pop();
}
+ /**
+ * Override this method to perform some additional processing on the block after its statements have been set. By
+ * default does nothing and returns the original block.
+ * @param block the block to operate on
+ * @return a modified block.
+ */
+ protected Block afterSetStatements(Block block) {
+ return block;
+ }
+
@SuppressWarnings("unchecked")
@Override
public <T extends LexicalContextNode> T pop(final T node) {
@@ -70,6 +79,7 @@
if (node instanceof Block) {
final List<Statement> newStatements = popStatements();
expected = (T)((Block)node).setStatements(this, newStatements);
+ expected = (T)afterSetStatements((Block)expected);
if (!sstack.isEmpty()) {
lastStatement = lastStatement(sstack.peek());
}
@@ -107,10 +117,7 @@
}
private static Statement lastStatement(final List<Statement> statements) {
- for (final ListIterator<Statement> iter = statements.listIterator(statements.size()); iter.hasPrevious(); ) {
- final Statement node = iter.previous();
- return node;
- }
- return null;
+ final int s = statements.size();
+ return s == 0 ? null : statements.get(s - 1);
}
}
diff --git a/nashorn/test/script/currently-failing/JDK-8019809.js b/nashorn/test/script/basic/JDK-8019809.js
similarity index 100%
rename from nashorn/test/script/currently-failing/JDK-8019809.js
rename to nashorn/test/script/basic/JDK-8019809.js
