jruby · Aug 9, 2017 · Aug 9, 2017 · Aug 9, 2017 · Aug 9, 2017
diff --git a/core/src/main/java/org/jruby/ast/CallNode.java b/core/src/main/java/org/jruby/ast/CallNode.java
@@ -140,6 +140,11 @@ public Node getReceiverNode() {
         return receiverNode;
     }
 
+    /**
+     * Is this call lazily execute because it was on right hand side of the lonely (&.) operator?
+     *
+     * @return true if so.
+     */
     public boolean isLazy() {
         return isLazy;
     }

diff --git a/core/src/main/java/org/jruby/ast/HashNode.java b/core/src/main/java/org/jruby/ast/HashNode.java
@@ -41,10 +41,11 @@
 
 /**
  * A Literal Hash that can represent either a {a=&amp;b, c=&amp;d} type expression or the list 
- * of default values in a method call.
+ * of default values or kwarg in a method call.
  */
 public class HashNode extends Node implements ILiteralNode {
     private final List<KeyValuePair<Node,Node>> pairs;
+    private boolean hasOnlySymbolKeys = true;
 
     public HashNode(ISourcePosition position) {
         super(position, false);
@@ -55,7 +56,14 @@ public HashNode(ISourcePosition position) {
     public HashNode(ISourcePosition position, KeyValuePair<Node,Node> pair) {
         this(position);
 
-        pairs.add(pair);
+        add(pair);
+    }
+
+    /**
+     * @return true if all elements of this hash uses symbol keys (might end up representing a kwarg).
+     */
+    public boolean hasOnlySymbolKeys() {
+        return hasOnlySymbolKeys;
     }
 
     public NodeType getNodeType() {
@@ -67,6 +75,9 @@ public HashNode add(KeyValuePair<Node,Node> pair) {
                 pair.getValue() != null && pair.getValue().containsVariableAssignment()) {
             containsVariableAssignment = true;
         }
+
+        if (!(pair.getKey() instanceof SymbolNode)) hasOnlySymbolKeys = false;
+
         pairs.add(pair);
 
         return this;

diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -865,10 +865,12 @@ private Operand buildAttrAssign(Variable result, AttrAssignNode attrAssignNode)
         boolean containsAssignment = attrAssignNode.containsVariableAssignment();
         Operand obj = buildWithOrder(attrAssignNode.getReceiverNode(), containsAssignment);
 
-        Label lazyLabel = getNewLabel();
-        Label endLabel = getNewLabel();
+        Label lazyLabel = null;
+        Label endLabel = null;
         if (result == null) result = createTemporaryVariable();
         if (attrAssignNode.isLazy()) {
+            lazyLabel = getNewLabel();
+            endLabel = getNewLabel();
             addInstr(new BNilInstr(lazyLabel, obj));
         }
 
@@ -1052,9 +1054,12 @@ public Operand buildCall(Variable result, CallNode callNode) {
             return result;
         }
 
-        Label lazyLabel = getNewLabel();
-        Label endLabel = getNewLabel();
+        Label lazyLabel = null;
+        Label endLabel = null;
+
         if (callNode.isLazy()) {
+            lazyLabel = getNewLabel();
+            endLabel = getNewLabel();
             addInstr(new BNilInstr(lazyLabel, receiver));
         }
 
@@ -3190,10 +3195,12 @@ public Operand buildOpAsgn(OpAsgnNode opAsgnNode) {
         // get attr
         Operand  v1 = build(opAsgnNode.getReceiverNode());
 
-        Label lazyLabel = getNewLabel();
-        Label endLabel = getNewLabel();
+        Label lazyLabel = null;
+        Label endLabel = null;
         Variable result = createTemporaryVariable();
         if (opAsgnNode.isLazy()) {
+            lazyLabel = getNewLabel();
+            endLabel = getNewLabel();
             addInstr(new BNilInstr(lazyLabel, v1));
         }
 

diff --git a/core/src/main/java/org/jruby/parser/ParserSupport.java b/core/src/main/java/org/jruby/parser/ParserSupport.java
@@ -118,6 +118,8 @@ public Node arg_concat(ISourcePosition position, Node node1, Node node2) {
         return node2 == null ? node1 : new ArgsCatNode(position, node1, node2);
     }
 
+    // firstNode is ArgsCatNode, SplatNode, ArrayNode, HashNode
+    // secondNode is null or not
     public Node arg_blk_pass(Node firstNode, BlockPassNode secondNode) {
         if (secondNode != null) {
             secondNode.setArgsNode(firstNode);

diff --git a/core/src/main/java/org/jruby/parser/RubyParser.y b/core/src/main/java/org/jruby/parser/RubyParser.y
@@ -1333,7 +1333,7 @@ opt_call_args   : none
                 }
 
 
-// [!null]
+// [!null] - ArgsCatNode, SplatNode, ArrayNode, HashNode, BlockPassNode
 call_args       : command {
                     value_expr(lexer, $1);
                     $$ = support.newArrayNode(support.getPosition($1), $1);
@@ -1352,6 +1352,7 @@ call_args       : command {
                 | block_arg {
                 }
 
+// [!null] - ArgsCatNode, SplatNode, ArrayNode, HashNode, BlockPassNode
 command_args    : /* none */ {
                     $$ = Long.valueOf(lexer.getCmdArgumentState().getStack());
                     lexer.getCmdArgumentState().begin();