Mercurial > hg > truffle

diff src/share/vm/opto/doCall.cpp @ 20327:411e30e5fbb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8026796: Make replace_in_map() on parent maps generic Summary: propagate node replacements along control flow edges to callers Reviewed-by: kvn, vlivanov
author roland
date Wed, 13 Aug 2014 11:00:22 +0200
parents 922c87c9aed4
children 331df100ad40
line wrap: on
line diff
--- a/src/share/vm/opto/doCall.cpp	Wed Apr 23 12:37:36 2014 +0200
+++ b/src/share/vm/opto/doCall.cpp	Wed Aug 13 11:00:22 2014 +0200
@@ -523,7 +523,7 @@
   // because exceptions don't return to the call site.)
   profile_call(receiver);
 
-  JVMState* new_jvms = cg->generate(jvms, this);
+  JVMState* new_jvms = cg->generate(jvms);
   if (new_jvms == NULL) {
     // When inlining attempt fails (e.g., too many arguments),
     // it may contaminate the current compile state, making it
@@ -537,7 +537,7 @@
     // intrinsic was expecting to optimize. Should always be possible to
     // get a normal java call that may inline in that case
     cg = C->call_generator(cg->method(), vtable_index, call_does_dispatch, jvms, try_inline, prof_factor(), speculative_receiver_type, /* allow_intrinsics= */ false);
-    if ((new_jvms = cg->generate(jvms, this)) == NULL) {
+    if ((new_jvms = cg->generate(jvms)) == NULL) {
       guarantee(failing(), "call failed to generate:  calls should work");
       return;
     }