Mercurial > hg > truffle
comparison src/share/vm/opto/output.cpp @ 1135:e66fd840cb6b
6893081: method handle & invokedynamic code needs additional cleanup (post 6815692, 6858164)
Summary: During the work for 6829187 we have fixed a number of basic bugs which are logically grouped with 6815692 and 6858164 but which must be reviewed and pushed separately.
Reviewed-by: kvn, never
author | twisti |
---|---|
date | Mon, 04 Jan 2010 18:38:08 +0100 |
parents | 148e5441d916 |
children | 97125851f396 |
comparison
equal
deleted
inserted
replaced
1134:0910903272e5 | 1135:e66fd840cb6b |
---|---|
909 | 909 |
910 // Make method available for all Safepoints | 910 // Make method available for all Safepoints |
911 ciMethod* scope_method = method ? method : _method; | 911 ciMethod* scope_method = method ? method : _method; |
912 // Describe the scope here | 912 // Describe the scope here |
913 assert(jvms->bci() >= InvocationEntryBci && jvms->bci() <= 0x10000, "must be a valid or entry BCI"); | 913 assert(jvms->bci() >= InvocationEntryBci && jvms->bci() <= 0x10000, "must be a valid or entry BCI"); |
914 assert(!jvms->should_reexecute() || depth==max_depth, "reexecute allowed only for the youngest"); | 914 assert(!jvms->should_reexecute() || depth == max_depth, "reexecute allowed only for the youngest"); |
915 // Now we can describe the scope. | 915 // Now we can describe the scope. |
916 debug_info()->describe_scope(safepoint_pc_offset,scope_method,jvms->bci(),jvms->should_reexecute(),locvals,expvals,monvals); | 916 bool is_method_handle_invoke = false; |
917 debug_info()->describe_scope(safepoint_pc_offset, scope_method, jvms->bci(), jvms->should_reexecute(), is_method_handle_invoke, locvals, expvals, monvals); | |
917 } // End jvms loop | 918 } // End jvms loop |
918 | 919 |
919 // Mark the end of the scope set. | 920 // Mark the end of the scope set. |
920 debug_info()->end_safepoint(safepoint_pc_offset); | 921 debug_info()->end_safepoint(safepoint_pc_offset); |
921 } | 922 } |