Mercurial > hg > truffle
comparison src/share/vm/runtime/vframeArray.cpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 8a3efb8c831d 9fae07c31641 |
children | b8f261ba79c6 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
231 } | 231 } |
232 } else if (JvmtiExport::can_force_early_return() && state != NULL && state->is_earlyret_pending()) { | 232 } else if (JvmtiExport::can_force_early_return() && state != NULL && state->is_earlyret_pending()) { |
233 // Force early return from top frame after deoptimization | 233 // Force early return from top frame after deoptimization |
234 #ifndef CC_INTERP | 234 #ifndef CC_INTERP |
235 pc = Interpreter::remove_activation_early_entry(state->earlyret_tos()); | 235 pc = Interpreter::remove_activation_early_entry(state->earlyret_tos()); |
236 #else | |
237 // TBD: Need to implement ForceEarlyReturn for CC_INTERP (ia64) | |
238 #endif | 236 #endif |
239 } else { | 237 } else { |
240 // Possibly override the previous pc computation of the top (youngest) frame | 238 // Possibly override the previous pc computation of the top (youngest) frame |
241 switch (exec_mode) { | 239 switch (exec_mode) { |
242 case Deoptimization::Unpack_deopt: | 240 case Deoptimization::Unpack_deopt: |