diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-01 12:28:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-01 12:28:51 +0000 |
| commit | 89b53873b29e9e93fa6ba49c9685b84c60c76a4c (patch) | |
| tree | f5c860c8f84d3ae77972e94eddfdefadd5d58dc1 /compiler/oat_writer.cc | |
| parent | 672db0289de1dec9513da14153f315fecb78649e (diff) | |
| parent | 32f5b4d2c8c9b52e9522941c159577b21752d0fa (diff) | |
| download | android_art-89b53873b29e9e93fa6ba49c9685b84c60c76a4c.tar.gz android_art-89b53873b29e9e93fa6ba49c9685b84c60c76a4c.tar.bz2 android_art-89b53873b29e9e93fa6ba49c9685b84c60c76a4c.zip | |
Merge "Vixl: Update the VIXL interface to VIXL 1.7 and enable VIXL debug."
Diffstat (limited to 'compiler/oat_writer.cc')
| -rw-r--r-- | compiler/oat_writer.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc index a57f892c58..8a7abb4001 100644 --- a/compiler/oat_writer.cc +++ b/compiler/oat_writer.cc @@ -366,6 +366,8 @@ class OatWriter::Arm64RelativeCallPatcher FINAL : public ArmBaseRelativeCallPatc Offset offset(mirror::ArtMethod::EntryPointFromQuickCompiledCodeOffset( kArm64PointerSize).Int32Value()); assembler.JumpTo(ManagedRegister(arm64::X0), offset, ManagedRegister(arm64::IP0)); + // Ensure we emit the literal pool. + assembler.EmitSlowPaths(); std::vector<uint8_t> thunk_code(assembler.CodeSize()); MemoryRegion code(thunk_code.data(), thunk_code.size()); assembler.FinalizeInstructions(code); |