Mercurial > hg > truffle
comparison src/share/vm/interpreter/interpreterRuntime.cpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 13:10:13 +0100 |
parents | 04b9a2566eec 20334ed5ed3c |
children | 18a5539bf19b |
comparison
equal
deleted
inserted
replaced
4703:2cfb7fb2dce7 | 4970:33df1aeaebbf |
---|---|
869 assert(fr.is_interpreted_frame(), "must come from interpreter"); | 869 assert(fr.is_interpreted_frame(), "must come from interpreter"); |
870 methodHandle method(thread, fr.interpreter_frame_method()); | 870 methodHandle method(thread, fr.interpreter_frame_method()); |
871 const int branch_bci = branch_bcp != NULL ? method->bci_from(branch_bcp) : InvocationEntryBci; | 871 const int branch_bci = branch_bcp != NULL ? method->bci_from(branch_bcp) : InvocationEntryBci; |
872 const int bci = branch_bcp != NULL ? method->bci_from(fr.interpreter_frame_bcp()) : InvocationEntryBci; | 872 const int bci = branch_bcp != NULL ? method->bci_from(fr.interpreter_frame_bcp()) : InvocationEntryBci; |
873 | 873 |
874 assert(!HAS_PENDING_EXCEPTION, "Should not have any exceptions pending"); | |
874 nmethod* osr_nm = CompilationPolicy::policy()->event(method, method, branch_bci, bci, CompLevel_none, NULL, thread); | 875 nmethod* osr_nm = CompilationPolicy::policy()->event(method, method, branch_bci, bci, CompLevel_none, NULL, thread); |
876 assert(!HAS_PENDING_EXCEPTION, "Event handler should not throw any exceptions"); | |
875 | 877 |
876 if (osr_nm != NULL) { | 878 if (osr_nm != NULL) { |
877 // We may need to do on-stack replacement which requires that no | 879 // We may need to do on-stack replacement which requires that no |
878 // monitors in the activation are biased because their | 880 // monitors in the activation are biased because their |
879 // BasicObjectLocks will need to migrate during OSR. Force | 881 // BasicObjectLocks will need to migrate during OSR. Force |