commit 40c68c690546e8c15dcb2de6137e72c74f573a75
author Nicolas Geoffray <ngeoffray@google.com> Wed Mar 23 16:35:51 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Mar 23 16:35:51 2016 +0000
tree ec74da146d809e87b388d8d8a1c5241d4dab694c
parent 3920099f578fd8015777bc3c1c7392a08b1e08e7

Fix dex2oat/oatdump cross-compilation.

Only set the ImtConflictTable when not in AOT, to not mess up
with the image.

Change-Id: I8f2926ad30dc913d61b0c8957affc25fc8056ada

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 941217f..512e8b8 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1606,8 +1606,8 @@
     method->SetEntryPointFromQuickCompiledCodePtrSize(nullptr, pointer_size);
   } else {
     method->SetEntryPointFromQuickCompiledCode(GetQuickImtConflictStub());
+    method->SetImtConflictTable(reinterpret_cast<ImtConflictTable*>(&empty_entry));
   }
-  method->SetImtConflictTable(reinterpret_cast<ImtConflictTable*>(&empty_entry));
   return method;
 }
 
@@ -1615,7 +1615,9 @@
   CHECK(method != nullptr);
   CHECK(method->IsRuntimeMethod());
   imt_conflict_method_ = method;
-  method->SetImtConflictTable(reinterpret_cast<ImtConflictTable*>(&empty_entry));
+  if (!IsAotCompiler()) {
+    method->SetImtConflictTable(reinterpret_cast<ImtConflictTable*>(&empty_entry));
+  }
 }
 
 ArtMethod* Runtime::CreateResolutionMethod() {
@@ -1933,7 +1935,9 @@
   CHECK(method != nullptr);
   CHECK(method->IsRuntimeMethod());
   imt_unimplemented_method_ = method;
-  method->SetImtConflictTable(reinterpret_cast<ImtConflictTable*>(&empty_entry));
+  if (!IsAotCompiler()) {
+    method->SetImtConflictTable(reinterpret_cast<ImtConflictTable*>(&empty_entry));
+  }
 }
 
 bool Runtime::IsVerificationEnabled() const {