diff options
| author | Edward Nevill edward.nevill@linaro.org <Edward Nevill edward.nevill@linaro.org> | 2014-07-22 14:37:17 +0100 |
|---|---|---|
| committer | Edward Nevill edward.nevill@linaro.org <Edward Nevill edward.nevill@linaro.org> | 2014-07-22 14:37:17 +0100 |
| commit | a305a500dd103e3b0bf2a98efe72960726abee2d (patch) | |
| tree | ec0e21e8a5f04a1f4b2b7e592bb417e4f61c2649 | |
| parent | c25c392c6fadc9264361b95ea81f5bd8eaa146c5 (diff) | |
Fix assertion failure in DeoptimizeAllTest
| -rw-r--r-- | src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp index f7f4814de..784f45f21 100644 --- a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp +++ b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp @@ -1313,6 +1313,9 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm, vmIntrinsics::ID iid = method->intrinsic_id(); intptr_t start = (intptr_t)__ pc(); int vep_offset = ((intptr_t)__ pc()) - start; + + // First instruction must be a nop as it may need to be patched on deoptimisation + __ nop(); gen_special_dispatch(masm, method, in_sig_bt, |