Fixes #4662. Line numbers in backtrace with multiline method invocati…

…on are sometimes different from CRuby.
jruby · Jun 12, 2017 · d7d063d · d7d063d
1 parent f86604a
commit d7d063d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -386,14 +386,18 @@ private void emitEnsureBlocks(IRLoop loop) {
         }
     }
 
-    private Operand buildOperand(Variable result, Node node) throws NotCompilableException {
+    private void determineIfWeNeedLineNumber(Node node) {
         if (node.isNewline()) {
             int currLineNum = node.getLine();
             if (currLineNum != _lastProcessedLineNum) { // Do not emit multiple line number instrs for the same line
                 needsLineNumInfo = true;
                 _lastProcessedLineNum = currLineNum;
             }
         }
+    }
+
+    private Operand buildOperand(Variable result, Node node) throws NotCompilableException {
+        determineIfWeNeedLineNumber(node);
 
         switch (node.getNodeType()) {
             case ALIASNODE: return buildAlias((AliasNode) node);
@@ -2700,6 +2704,7 @@ public Operand buildFCall(Variable result, FCallNode fcallNode) {
             }
         }
 
+        determineIfWeNeedLineNumber(fcallNode); // buildOperand for fcall was papered over by args operand building so we check once more.
         CallInstr callInstr = CallInstr.create(scope, CallType.FUNCTIONAL, result, fcallNode.getName(), buildSelf(), args, block);
         receiveBreakException(block, callInstr);
         return result;