< prev index next >

src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java

Print this page

        

@@ -1608,11 +1608,11 @@
                         method.swap();
                         argCount = loadArgs(args);
                     }
                     @Override
                     void consumeStack() {
-                        dynamicCall(2 + argCount, flags, node.getProperty());
+                        dynamicCall(2 + argCount, flags, node.toString(false));
                     }
                 }.emit();
 
                 return false;
             }

@@ -1633,13 +1633,11 @@
                         argsCount = loadArgs(args);
                     }
 
                     @Override
                     void consumeStack() {
-                        final int flags = getCallSiteFlags();
-                        //assert callNodeType.equals(callee.getReturnType()) : callNodeType + " != " + callee.getReturnType();
-                        dynamicCall(2 + argsCount, flags, origCallee.getName());
+                        dynamicCall(2 + argsCount, getCallSiteFlags(), origCallee.getName());
                     }
                 }.emit();
                 return false;
             }
 

@@ -1664,12 +1662,11 @@
                         method.swap();
                         argsCount = loadArgs(args);
                     }
                     @Override
                     void consumeStack() {
-                        final int flags = getCallSiteFlags();
-                        dynamicCall(2 + argsCount, flags, null);
+                        dynamicCall(2 + argsCount, getCallSiteFlags(), node.toString(false));
                     }
                 }.emit();
                 return false;
             }
 

@@ -1685,11 +1682,11 @@
                         argsCount = loadArgs(args);
                         }
                         @Override
                         void consumeStack() {
                             final int flags = getCallSiteFlags() | CALLSITE_SCOPE;
-                            dynamicCall(2 + argsCount, flags, null);
+                            dynamicCall(2 + argsCount, flags, node.toString(false));
                         }
                 }.emit();
                 return false;
             }
         });

@@ -3709,12 +3706,11 @@
 
         final Expression func = callNode.getFunction();
         // Load function reference.
         loadExpressionAsObject(func); // must detect type error
 
-        method.dynamicNew(1 + loadArgs(args), getCallSiteFlags(),
-            func instanceof IdentNode? ((IdentNode)func).getName() : null);
+        method.dynamicNew(1 + loadArgs(args), getCallSiteFlags(), func.toString(false));
     }
 
     private void loadNOT(final UnaryNode unaryNode) {
         final Expression expr = unaryNode.getExpression();
         if(expr instanceof UnaryNode && expr.isTokenType(TokenType.NOT)) {
< prev index next >