Mercurial > hg > graal-compiler
comparison src/share/vm/opto/bytecodeInfo.cpp @ 903:15bbd3f505c0
Merge
author | kvn |
---|---|
date | Thu, 06 Aug 2009 09:37:26 -0700 |
parents | bd02caa94611 9987d9d5eb0e |
children | 97125851f396 |
comparison
equal
deleted
inserted
replaced
891:703065c670fa | 903:15bbd3f505c0 |
---|---|
35 NOT_PRODUCT(_count_inlines = 0;) | 35 NOT_PRODUCT(_count_inlines = 0;) |
36 if (_caller_jvms != NULL) { | 36 if (_caller_jvms != NULL) { |
37 // Keep a private copy of the caller_jvms: | 37 // Keep a private copy of the caller_jvms: |
38 _caller_jvms = new (C) JVMState(caller_jvms->method(), caller_tree->caller_jvms()); | 38 _caller_jvms = new (C) JVMState(caller_jvms->method(), caller_tree->caller_jvms()); |
39 _caller_jvms->set_bci(caller_jvms->bci()); | 39 _caller_jvms->set_bci(caller_jvms->bci()); |
40 assert(!caller_jvms->should_reexecute(), "there should be no reexecute bytecode with inlining"); | |
40 } | 41 } |
41 assert(_caller_jvms->same_calls_as(caller_jvms), "consistent JVMS"); | 42 assert(_caller_jvms->same_calls_as(caller_jvms), "consistent JVMS"); |
42 assert((caller_tree == NULL ? 0 : caller_tree->inline_depth() + 1) == inline_depth(), "correct (redundant) depth parameter"); | 43 assert((caller_tree == NULL ? 0 : caller_tree->inline_depth() + 1) == inline_depth(), "correct (redundant) depth parameter"); |
43 assert(caller_bci == this->caller_bci(), "correct (redundant) bci parameter"); | 44 assert(caller_bci == this->caller_bci(), "correct (redundant) bci parameter"); |
44 if (UseOldInlining) { | 45 if (UseOldInlining) { |