Mercurial > hg > truffle
comparison src/share/vm/prims/jvmtiEnvBase.cpp @ 5130:ab038e0d6b43
Merge
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Wed, 21 Mar 2012 11:28:22 +0100 |
parents | 0ebca2e35ca5 |
children | 957c266d8bc5 |
comparison
equal
deleted
inserted
replaced
5129:51111665eda6 | 5130:ab038e0d6b43 |
---|---|
1338 // If the frame is a compiled one, need to deoptimize it. | 1338 // If the frame is a compiled one, need to deoptimize it. |
1339 if (vf->is_compiled_frame()) { | 1339 if (vf->is_compiled_frame()) { |
1340 if (!vf->fr().can_be_deoptimized()) { | 1340 if (!vf->fr().can_be_deoptimized()) { |
1341 return JVMTI_ERROR_OPAQUE_FRAME; | 1341 return JVMTI_ERROR_OPAQUE_FRAME; |
1342 } | 1342 } |
1343 Deoptimization::deoptimize_frame(java_thread, jvf->fr().id()); | 1343 Deoptimization::deoptimize_frame(java_thread, jvf->fr().id(), Deoptimization::Reason_constraint); |
1344 } | 1344 } |
1345 | 1345 |
1346 // Get information about method return type | 1346 // Get information about method return type |
1347 Symbol* signature = jvf->method()->signature(); | 1347 Symbol* signature = jvf->method()->signature(); |
1348 | 1348 |