Mercurial > hg > graal-compiler

diff src/share/vm/opto/doCall.cpp @ 12956:3213ba4d3dff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8024069: replace_in_map() should operate on parent maps Summary: type information gets lost because replace_in_map() doesn't update parent maps Reviewed-by: kvn, twisti
author roland
date Sat, 19 Oct 2013 12:16:43 +0200
parents 29bdcf12457c
children b2ee5dc63353
line wrap: on
line diff
--- a/src/share/vm/opto/doCall.cpp	Fri Oct 18 12:15:32 2013 -0700
+++ b/src/share/vm/opto/doCall.cpp	Sat Oct 19 12:16:43 2013 +0200
@@ -495,7 +495,7 @@
   // because exceptions don't return to the call site.)
   profile_call(receiver);
 
-  JVMState* new_jvms = cg->generate(jvms);
+  JVMState* new_jvms = cg->generate(jvms, this);
   if (new_jvms == NULL) {
     // When inlining attempt fails (e.g., too many arguments),
     // it may contaminate the current compile state, making it
@@ -509,7 +509,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(), /* allow_intrinsics= */ false);
-    if ((new_jvms = cg->generate(jvms)) == NULL) {
+    if ((new_jvms = cg->generate(jvms, this)) == NULL) {
       guarantee(failing(), "call failed to generate:  calls should work");
       return;
     }