Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/vframeArray.cpp @ 7226:8a3efb8c831d
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 14 Dec 2012 13:02:49 +0100 |
parents | ceb8c5b29419 5d0bb7d52783 |
children | 5fc51c1ecdeb |
comparison
equal
deleted
inserted
replaced
7225:31c4d9f9e922 | 7226:8a3efb8c831d |
---|---|
250 // in interpreterRuntime.cpp. | 250 // in interpreterRuntime.cpp. |
251 break; | 251 break; |
252 case Deoptimization::Unpack_uncommon_trap: | 252 case Deoptimization::Unpack_uncommon_trap: |
253 case Deoptimization::Unpack_reexecute: | 253 case Deoptimization::Unpack_reexecute: |
254 // redo last byte code | 254 // redo last byte code |
255 #ifdef GRAAL | 255 #ifdef GRAALVM |
256 assert(should_reexecute(), ""); | 256 assert(should_reexecute(), ""); |
257 #endif | 257 #endif |
258 pc = Interpreter::deopt_entry(vtos, 0); | 258 pc = Interpreter::deopt_entry(vtos, 0); |
259 use_next_mdp = false; | 259 use_next_mdp = false; |
260 break; | 260 break; |