jruby · Oct 24, 2014 · Oct 24, 2014 · Oct 24, 2014 · Oct 24, 2014 · Oct 24, 2014
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -79,7 +79,6 @@
 import org.jruby.internal.runtime.methods.JavaMethod;
 import org.jruby.ir.Compiler;
 import org.jruby.ir.IRManager;
-import org.jruby.ir.IRScriptBody;
 import org.jruby.ir.interpreter.Interpreter;
 import org.jruby.ir.persistence.IRReader;
 import org.jruby.ir.persistence.IRReaderFile;
@@ -158,7 +157,6 @@
 import java.security.AccessControlException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -172,7 +170,6 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -2673,7 +2670,7 @@ private Node parseFileFromMainAndGetAST(InputStream in, String file, DynamicScop
 
      private Node parseFileAndGetAST(InputStream in, String file, DynamicScope scope, int lineNumber, boolean isFromMain) {
          ParserConfiguration parserConfig =
-                 new ParserConfiguration(this, lineNumber, false, false, true, isFromMain, config);
+                 new ParserConfiguration(this, lineNumber, false, true, config);
          setupSourceEncoding(parserConfig);
          return parser.parse(file, in, scope, parserConfig);
      }
@@ -2699,8 +2696,7 @@ private void setupSourceEncoding(ParserConfiguration parserConfig) {
 
     public Node parseEval(String content, String file, DynamicScope scope, int lineNumber) {
         addEvalParseToStats();
-        return parser.parse(file, content.getBytes(), scope, new ParserConfiguration(this,
-                lineNumber, false, false, false, false, config));
+        return parser.parse(file, content.getBytes(), scope, new ParserConfiguration(this, lineNumber, false, false, config));
     }
 
     @Deprecated

diff --git a/core/src/main/java/org/jruby/ast/NilImplicitNode.java b/core/src/main/java/org/jruby/ast/NilImplicitNode.java
@@ -1,6 +1,6 @@
 package org.jruby.ast;
 
-import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.lexer.yacc.InvalidSourcePosition;
 
 /**
  * A node which behaves like a nil node, but is not actually present in the AST as a syntactical
@@ -11,7 +11,7 @@ public class NilImplicitNode extends NilNode implements InvisibleNode {
     public static final NilImplicitNode NIL = new NilImplicitNode();
 
     public NilImplicitNode() {
-        super(ISourcePosition.INVALID_POSITION);
+        super(InvalidSourcePosition.INSTANCE);
     }
 
     public boolean isNil() {

diff --git a/core/src/main/java/org/jruby/ast/Node.java b/core/src/main/java/org/jruby/ast/Node.java
@@ -126,7 +126,7 @@ public String toString(boolean indent, int indentation) {
             builder.append(":").append(((INameNode) this).getName());
         }
 
-        builder.append(" ").append(getPosition().getStartLine());
+        builder.append(" ").append(getPosition().getLine());
 
         if (!childNodes().isEmpty() && indent) {
             builder.append("\n");

diff --git a/core/src/main/java/org/jruby/ast/RequiredKeywordArgumentValueNode.java b/core/src/main/java/org/jruby/ast/RequiredKeywordArgumentValueNode.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 import org.jruby.ast.visitor.NodeVisitor;
-import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.lexer.yacc.InvalidSourcePosition;
 
 /**
  * Marker to indicate that rather than assigning nil (where in multiple
@@ -14,7 +14,7 @@
  */
 public class RequiredKeywordArgumentValueNode extends Node implements InvisibleNode {
     public RequiredKeywordArgumentValueNode() {
-        super(ISourcePosition.INVALID_POSITION);
+        super(InvalidSourcePosition.INSTANCE);
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ast/util/SexpMaker.java b/core/src/main/java/org/jruby/ast/util/SexpMaker.java
@@ -1,11 +1,9 @@
 package org.jruby.ast.util;
 
 import java.io.File;
-import java.nio.CharBuffer;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.jruby.ast.AliasNode;
@@ -223,7 +221,7 @@ private static void processMethod(Builder sb, String methodName, Node argsNode,
         sb.append("(method ").append(methodName).append(' ');
         // JRUBY-4301, include filename and line in sexp
         sb.append("(file ").append(new File(body.getPosition().getFile()).getName()).append(") ");
-        sb.append("(line ").append(body.getPosition().getStartLine()).append(") ");
+        sb.append("(line ").append(body.getPosition().getLine()).append(") ");
         process(sb, argsNode);
         sb.append(' ');
         process(sb, body);

diff --git a/core/src/main/java/org/jruby/common/RubyWarnings.java b/core/src/main/java/org/jruby/common/RubyWarnings.java
@@ -69,7 +69,7 @@ public boolean isVerbose() {
     public void warn(ID id, ISourcePosition position, String message) {
         if (!runtime.warningsEnabled()) return;
 
-        warn(id, position.getFile(), position.getStartLine() + 1, message);
+        warn(id, position.getFile(), position.getLine() + 1, message);
     }
 
     /**
@@ -168,7 +168,7 @@ public void warning(ID id, ISourcePosition position, String message) {
         if (!isVerbose()) return;
         if (!runtime.warningsEnabled()) return;
 
-        warning(id, position.getFile(), position.getStartLine() + 1, message);
+        warning(id, position.getFile(), position.getLine() + 1, message);
     }
 
     /**

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/CompiledMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/CompiledMethod.java
@@ -230,7 +230,7 @@ public String getFile() {
 
         public int getLine() {
             if (compiledMethod == null) initializeMethod();
-            return position.getStartLine();
+            return position.getLine();
         }
 
         public String[] getParameterList() {
@@ -306,7 +306,7 @@ public String getFile() {
     }
 
     public int getLine() {
-        return position.getStartLine();
+        return position.getLine();
     }
 
     public Object getScriptObject() {

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java b/core/src/main/java/org/jruby/internal/runtime/methods/InvocationMethodFactory.java
@@ -282,7 +282,7 @@ public DynamicMethod getCompiledMethod(
                     scope,
                     callConfig,
                     position.getFile(),
-                    position.getStartLine(),
+                    position.getLine(),
                     methodNodes);
             generatedClass = endCallWithBytes(invokerBytes, invokerPath);
         } catch (LinkageError le) {

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/ReflectedCompiledMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/ReflectedCompiledMethod.java
@@ -65,7 +65,7 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
             boolean isTrace = runtime.hasEventHooks();
             try {
                 if (isTrace) {
-                    runtime.callEventHooks(context, RubyEvent.CALL, position.getFile(), position.getStartLine(), name, getImplementationClass());
+                    runtime.callEventHooks(context, RubyEvent.CALL, position.getFile(), position.getLine(), name, getImplementationClass());
                 }
                 return (IRubyObject)method.invoke(null, $scriptObject, context, self, args, block);
             } finally {

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -467,7 +467,7 @@ public IRBuilder newIRBuilder(IRManager manager) {
     public Node skipOverNewlines(IRScope s, Node n) {
         if (n.getNodeType() == NodeType.NEWLINENODE) {
             // Do not emit multiple line number instrs for the same line
-            int currLineNum = n.getPosition().getStartLine();
+            int currLineNum = n.getPosition().getLine();
             if (currLineNum != _lastProcessedLineNum) {
                 if (RubyInstanceConfig.FULL_TRACE_ENABLED) {
                     addInstr(s, new TraceInstr(RubyEvent.LINE, methodNameFor(s), s.getFileName(), currLineNum));
@@ -504,7 +504,7 @@ public Operand build(Node node, IRScope s) {
     }
 
     public Operand buildLambda(LambdaNode node, IRScope s) {
-        IRClosure closure = new IRClosure(manager, s, node.getPosition().getStartLine(), node.getScope(), Arity.procArityOf(node.getArgs()), node.getArgumentType());
+        IRClosure closure = new IRClosure(manager, s, node.getPosition().getLine(), node.getScope(), Arity.procArityOf(node.getArgs()), node.getArgumentType());
 
         // Create a new nested builder to ensure this gets its own IR builder state
         // like the ensure block stack
@@ -990,7 +990,7 @@ public Operand buildCall(CallNode callNode, IRScope s) {
             callInstr.setProcNew(true);
         }
 
-        receiveBreakException(s, block, callInstr, callNode.getPosition().getStartLine());
+        receiveBreakException(s, block, callInstr, callNode.getPosition().getLine());
         return callResult;
     }
 
@@ -1107,7 +1107,7 @@ public Operand buildClass(ClassNode classNode, IRScope s) {
         IRClassBody body = new IRClassBody(manager, s, className, classNode.getPosition().getLine(), classNode.getScope());
         Variable tmpVar = addResultInstr(s, new DefineClassInstr(s.createTemporaryVariable(), body, container, superClass));
 
-        return buildModuleOrClassBody(s, tmpVar, body, classNode.getBodyNode(), classNode.getPosition().getStartLine());
+        return buildModuleOrClassBody(s, tmpVar, body, classNode.getBodyNode(), classNode.getPosition().getLine());
     }
 
     // class Foo; class << self; end; end
@@ -1118,7 +1118,7 @@ public Operand buildSClass(SClassNode sclassNode, IRScope s) {
         IRModuleBody body = new IRMetaClassBody(manager, s, manager.getMetaClassName(), sclassNode.getPosition().getLine(), sclassNode.getScope());
         Variable tmpVar = addResultInstr(s, new DefineMetaClassInstr(s.createTemporaryVariable(), receiver, body));
 
-        return buildModuleOrClassBody(s, tmpVar, body, sclassNode.getBodyNode(), sclassNode.getPosition().getStartLine());
+        return buildModuleOrClassBody(s, tmpVar, body, sclassNode.getBodyNode(), sclassNode.getPosition().getLine());
     }
 
     // @@c
@@ -1648,17 +1648,18 @@ public Operand buildDAsgn(final DAsgnNode dasgnNode, IRScope s) {
         // because of the use of copyAndReturnValue method for literal objects.
     }
 
-    private IRMethod defineNewMethod(MethodDefNode defNode, IRScope s, boolean isInstanceMethod) {
-        IRMethod method = new IRMethod(manager, s, defNode.getName(), isInstanceMethod, defNode.getPosition().getLine(), defNode.getScope());
+    // Called by defineMethod but called on a new builder so things like ensure block info recording
+    // do not get confused.
+    private IRMethod defineMethodInner(MethodDefNode defNode, IRMethod method, IRScope parent) {
         if (RubyInstanceConfig.FULL_TRACE_ENABLED) {
-            addInstr(method, new TraceInstr(RubyEvent.CALL, defNode.getName(), s.getFileName(), defNode.getPosition().getStartLine()));
+            addInstr(method, new TraceInstr(RubyEvent.CALL, method.getName(), method.getFileName(), method.getLineNumber()));
         }
 
         addInstr(method, new ReceiveSelfInstr(method.getSelf()));
 
         // Set %current_scope = <current-scope>
         // Set %current_module = isInstanceMethod ? %self.metaclass : %self
-        int nearestScopeDepth = s.getNearestModuleReferencingScopeDepth();
+        int nearestScopeDepth = parent.getNearestModuleReferencingScopeDepth();
 
         // Build IR for arguments (including the block arg)
         receiveMethodArgs(defNode.getArgsNode(), method);
@@ -1673,19 +1674,23 @@ private IRMethod defineNewMethod(MethodDefNode defNode, IRScope s, boolean isIns
         Operand rv = newIRBuilder(manager).build(defNode.getBodyNode(), method);
 
         if (RubyInstanceConfig.FULL_TRACE_ENABLED) {
-            addInstr(method, new TraceInstr(RubyEvent.RETURN, defNode.getName(), s.getFileName(), -1));
+            addInstr(method, new TraceInstr(RubyEvent.RETURN, method.getName(), method.getFileName(), -1));
         }
 
         if (rv != null) addInstr(method, new ReturnInstr(rv));
 
         // If the method can receive non-local returns
-        if (method.canReceiveNonlocalReturns()) {
-            handleNonlocalReturnInMethod(method);
-        }
+        if (method.canReceiveNonlocalReturns()) handleNonlocalReturnInMethod(method);
 
         return method;
     }
 
+    private IRMethod defineNewMethod(MethodDefNode defNode, IRScope parent, boolean isInstanceMethod) {
+        IRMethod method = new IRMethod(manager, parent, defNode.getName(), isInstanceMethod, defNode.getPosition().getLine(), defNode.getScope());
+
+        return newIRBuilder(manager).defineMethodInner(defNode, method, parent);
+    }
+
     public Operand buildDefn(MethodDefNode node, IRScope s) { // Instance method
         IRMethod method = defineNewMethod(node, s, true);
         addInstr(s, new DefineInstanceMethodInstr(method));
@@ -2238,7 +2243,7 @@ public Operand buildFCall(FCallNode fcallNode, IRScope s) {
         Operand       block        = setupCallClosure(fcallNode.getIterNode(), s);
         Variable      callResult   = s.createTemporaryVariable();
         CallInstr     callInstr    = CallInstr.create(CallType.FUNCTIONAL, callResult, new MethAddr(fcallNode.getName()), s.getSelf(), args.toArray(new Operand[args.size()]), block);
-        receiveBreakException(s, block, callInstr, fcallNode.getPosition().getStartLine());
+        receiveBreakException(s, block, callInstr, fcallNode.getPosition().getLine());
         return callResult;
     }
 
@@ -2355,14 +2360,14 @@ public Operand buildFor(ForNode forNode, IRScope s) {
         Operand  receiver = build(forNode.getIterNode(), s);
         Operand  forBlock = buildForIter(forNode, s);
         CallInstr callInstr = new CallInstr(CallType.NORMAL, result, new MethAddr("each"), receiver, NO_ARGS, forBlock);
-        receiveBreakException(s, forBlock, callInstr, forNode.getPosition().getStartLine());
+        receiveBreakException(s, forBlock, callInstr, forNode.getPosition().getLine());
 
         return result;
     }
 
     public Operand buildForIter(final ForNode forNode, IRScope s) {
             // Create a new closure context
-        IRClosure closure = new IRFor(manager, s, forNode.getPosition().getStartLine(), forNode.getScope(), Arity.procArityOf(forNode.getVarNode()), forNode.getArgumentType());
+        IRClosure closure = new IRFor(manager, s, forNode.getPosition().getLine(), forNode.getScope(), Arity.procArityOf(forNode.getVarNode()), forNode.getArgumentType());
 
         // Create a new nested builder to ensure this gets its own IR builder state
         // like the ensure block stack
@@ -2513,7 +2518,7 @@ public Operand buildInstVar(InstVarNode node, IRScope s) {
     }
 
     public Operand buildIter(final IterNode iterNode, IRScope s) {
-        IRClosure closure = new IRClosure(manager, s, iterNode.getPosition().getStartLine(), iterNode.getScope(), Arity.procArityOf(iterNode.getVarNode()), iterNode.getArgumentType());
+        IRClosure closure = new IRClosure(manager, s, iterNode.getPosition().getLine(), iterNode.getScope(), Arity.procArityOf(iterNode.getVarNode()), iterNode.getArgumentType());
 
         // Create a new nested builder to ensure this gets its own IR builder state
         // like the ensure block stack
@@ -2655,7 +2660,7 @@ public Operand buildModule(ModuleNode moduleNode, IRScope s) {
         IRModuleBody body = new IRModuleBody(manager, s, moduleName, moduleNode.getPosition().getLine(), moduleNode.getScope());
         Variable tmpVar = addResultInstr(s, new DefineModuleInstr(s.createTemporaryVariable(), body, container));
 
-        return buildModuleOrClassBody(s, tmpVar, body, moduleNode.getBodyNode(), moduleNode.getPosition().getStartLine());
+        return buildModuleOrClassBody(s, tmpVar, body, moduleNode.getBodyNode(), moduleNode.getPosition().getLine());
     }
 
     public Operand buildMultipleAsgn(MultipleAsgnNode multipleAsgnNode, IRScope s) {
@@ -2944,7 +2949,7 @@ public Operand buildPostExe(PostExeNode postExeNode, IRScope s) {
         IRScope topLevel = s.getTopLevelScope();
         IRScope nearestLVarScope = s.getNearestTopLocalVariableScope();
 
-        IRClosure endClosure = new IRClosure(manager, s, postExeNode.getPosition().getStartLine(), nearestLVarScope.getStaticScope(), Arity.procArityOf(postExeNode.getVarNode()), postExeNode.getArgumentType(), "_END_", true);
+        IRClosure endClosure = new IRClosure(manager, s, postExeNode.getPosition().getLine(), nearestLVarScope.getStaticScope(), Arity.procArityOf(postExeNode.getVarNode()), postExeNode.getArgumentType(), "_END_", true);
         // Create a new nested builder to ensure this gets its own IR builder state
         // like the ensure block stack
         IRBuilder closureBuilder = newIRBuilder(manager);
@@ -2964,7 +2969,7 @@ public Operand buildPostExe(PostExeNode postExeNode, IRScope s) {
     }
 
     public Operand buildPreExe(PreExeNode preExeNode, IRScope s) {
-        IRClosure beginClosure = new IRFor(manager, s, preExeNode.getPosition().getStartLine(), s.getTopLevelScope().getStaticScope(), Arity.procArityOf(preExeNode.getVarNode()), preExeNode.getArgumentType(), "_BEGIN_");
+        IRClosure beginClosure = new IRFor(manager, s, preExeNode.getPosition().getLine(), s.getTopLevelScope().getStaticScope(), Arity.procArityOf(preExeNode.getVarNode()), preExeNode.getArgumentType(), "_BEGIN_");
         // Create a new nested builder to ensure this gets its own IR builder state
         // like the ensure block stack
         IRBuilder closureBuilder = newIRBuilder(manager);
@@ -3299,7 +3304,7 @@ public Operand buildSuper(SuperNode superNode, IRScope s) {
         List<Operand> args = setupCallArgs(superNode.getArgsNode(), s);
         Operand block = setupCallClosure(superNode.getIterNode(), s);
         if (block == null) block = getImplicitBlockArg(s);
-        return buildSuperInstr(s, block, args.toArray(new Operand[args.size()]), superNode.getPosition().getStartLine());
+        return buildSuperInstr(s, block, args.toArray(new Operand[args.size()]), superNode.getPosition().getLine());
     }
 
     private Operand buildSuperInScriptBody(IRScope s) {
@@ -3490,7 +3495,7 @@ public Operand buildZSuper(ZSuperNode zsuperNode, IRScope s) {
         Operand block = setupCallClosure(zsuperNode.getIterNode(), s);
         if (block == null) block = getImplicitBlockArg(s);
 
-        int linenumber = zsuperNode.getPosition().getStartLine();
+        int linenumber = zsuperNode.getPosition().getLine();
 
         // Enebo:ZSuper in for (or nested for) can be statically resolved like method but it needs
         // to fixup depth.

diff --git a/core/src/main/java/org/jruby/ir/IRManager.java b/core/src/main/java/org/jruby/ir/IRManager.java
@@ -17,10 +17,10 @@
 /**
  */
 public class IRManager {
-    public static String SAFE_COMPILER_PASSES = "";
-    public static String DEFAULT_COMPILER_PASSES = "OptimizeTempVarsPass,LocalOptimizationPass";
-    public static String DEFAULT_JIT_PASSES = "DeadCodeElimination,AddLocalVarLoadStoreInstructions,OptimizeDynScopesPass,AddCallProtocolInstructions,EnsureTempsAssigned";
-    public static String DEFAULT_INLINING_COMPILER_PASSES = "LocalOptimizationPass";
+    public static final String SAFE_COMPILER_PASSES = "";
+    public static final String DEFAULT_COMPILER_PASSES = "OptimizeTempVarsPass,LocalOptimizationPass";
+    public static final String DEFAULT_JIT_PASSES = "DeadCodeElimination,AddLocalVarLoadStoreInstructions,OptimizeDynScopesPass,AddCallProtocolInstructions,EnsureTempsAssigned";
+    public static final String DEFAULT_INLINING_COMPILER_PASSES = "LocalOptimizationPass";
 
     private int dummyMetaClassCount = 0;
     private final IRModuleBody object = new IRClassBody(this, null, "Object", "", 0, null);

diff --git a/core/src/main/java/org/jruby/ir/instructions/RuntimeHelperCall.java b/core/src/main/java/org/jruby/ir/instructions/RuntimeHelperCall.java
@@ -1,6 +1,7 @@
 package org.jruby.ir.instructions;
 
 import org.jruby.RubyModule;
+import org.jruby.ir.IRScope;
 import org.jruby.ir.IRVisitor;
 import org.jruby.ir.Operation;
 import org.jruby.ir.operands.Boolean;
@@ -16,6 +17,8 @@
 import java.util.Arrays;
 import java.util.Map;
 
+import static org.jruby.ir.IRFlags.REQUIRES_FRAME;
+
 public class RuntimeHelperCall extends Instr implements ResultInstr {
     public enum Methods {
         HANDLE_PROPAGATE_BREAK, HANDLE_NONLOCAL_RETURN, HANDLE_BREAK_AND_RETURNS_IN_LAMBDA,
@@ -65,6 +68,25 @@ public void simplifyOperands(Map<Operand, Operand> valueMap, boolean force) {
         }
     }
 
+    /**
+     * Does this instruction do anything the scope is interested in?
+     *
+     * @param scope
+     * @return true if it modified the scope.
+     */
+    @Override
+    public boolean computeScopeFlags(IRScope scope) {
+        boolean modifiedScope = false;
+
+        // FIXME: Impl of this helper uses frame class.  Determine if we can do this another way.
+        if (helperMethod == Methods.IS_DEFINED_SUPER) {
+            modifiedScope = true;
+            scope.getFlags().add(REQUIRES_FRAME);
+        }
+
+        return modifiedScope;
+    }
+
     @Override
     public Instr clone(CloneInfo ii) {
         // SSS FIXME: array of args cloning should be part of utility class