Mercurial > hg > truffle
comparison src/share/vm/runtime/thread.cpp @ 7483:729a79037bd5
Fixes after merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 14:41:04 +0100 |
parents | 989155e2d07a |
children | 3ac7d10a6572 |
comparison
equal
deleted
inserted
replaced
7482:989155e2d07a | 7483:729a79037bd5 |
---|---|
2205 if (f.is_runtime_frame() || f.is_safepoint_blob_frame()) { | 2205 if (f.is_runtime_frame() || f.is_safepoint_blob_frame()) { |
2206 // BiasedLocking needs an updated RegisterMap for the revoke monitors pass | 2206 // BiasedLocking needs an updated RegisterMap for the revoke monitors pass |
2207 RegisterMap reg_map(this, UseBiasedLocking); | 2207 RegisterMap reg_map(this, UseBiasedLocking); |
2208 frame compiled_frame = f.sender(®_map); | 2208 frame compiled_frame = f.sender(®_map); |
2209 if (!StressCompiledExceptionHandlers && compiled_frame.can_be_deoptimized()) { | 2209 if (!StressCompiledExceptionHandlers && compiled_frame.can_be_deoptimized()) { |
2210 Deoptimization::deoptimize(this, compiled_frame, ®_map); | 2210 Deoptimization::deoptimize(this, compiled_frame, ®_map, Deoptimization::Reason_constraint); |
2211 } | 2211 } |
2212 } | 2212 } |
2213 } | 2213 } |
2214 | 2214 |
2215 // Set async. pending exception in thread. | 2215 // Set async. pending exception in thread. |