Mercurial > hg > truffle

diff src/share/vm/c1/c1_LIRGenerator.cpp @ 4116:973293defacd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7112085: assert(fr.interpreter_frame_expression_stack_size()==0) failed: only handle empty stacks Summary: Move the inlinee invoke notification callback into inlinee preamble Reviewed-by: kvn, never
author iveresov
date Wed, 16 Nov 2011 19:42:58 -0800
parents 940513efe83a
children 04b9a2566eec 069ab3f976d3
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRGenerator.cpp	Wed Nov 16 09:13:57 2011 -0800
+++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Wed Nov 16 19:42:58 2011 -0800
@@ -429,7 +429,7 @@
         // all locals are dead on exit from the synthetic unlocker
         liveness.clear();
       } else {
-        assert(x->as_MonitorEnter(), "only other case is MonitorEnter");
+        assert(x->as_MonitorEnter() || x->as_ProfileInvoke(), "only other cases are MonitorEnter and ProfileInvoke");
       }
     }
     if (!liveness.is_valid()) {