Compiler crash on Deodexed TW about android_art HOT 16 CLOSED

diff -rU3 romracer/compiler/driver/compiler_driver.cc rovo89/compiler/driver/compiler_driver.cc
--- romracer/compiler/driver/compiler_driver.cc 2015-09-02 22:40:48.838916356 +0200
+++ rovo89/compiler/driver/compiler_driver.cc   2015-09-02 22:45:43.685412851 +0200
@@ -1167,7 +1167,9 @@
   // invoked, so this can be passed to the out-of-line runtime support code.
   *direct_code = 0;
   *direct_method = 0;
-  bool use_dex_cache = GetCompilerOptions().GetCompilePic();  // Off by default
+  // Direct branching to the method's code offset means that Xposed hooks are not considered.
+  // So we always need to go through the dex cache/ArtMethod.
+  bool use_dex_cache = true;
   const bool compiling_boot = Runtime::Current()->GetHeap()->IsCompilingBoot();
   // TODO This is somewhat hacky. We should refactor all of this invoke codepath.
   const bool force_relocations = (compiling_boot ||
@@ -1184,9 +1186,6 @@
     // TODO: support patching on all architectures.
     use_dex_cache = use_dex_cache || (force_relocations && !support_boot_image_fixup_);
   }
-  // Direct branching to the method's code offset means that Xposed hooks are not considered
-  // So we always need to go through the dex cache/ArtMethod
-  use_dex_cache = true;
   mirror::Class* declaring_class = method->GetDeclaringClass();
   bool method_code_in_boot = (declaring_class->GetClassLoader() == nullptr);
   if (!use_dex_cache) {

diff -rU3 romracer/runtime/gc/space/image_space.cc rovo89/runtime/gc/space/image_space.cc
--- romracer/runtime/gc/space/image_space.cc    2015-09-02 22:42:06.905538134 +0200
+++ rovo89/runtime/gc/space/image_space.cc      2015-09-02 22:46:06.782066116 +0200
@@ -500,8 +500,7 @@
   // TODO: Consider relocating in the rare case that the system image is already prepared for Xposed

   if (image_filename != nullptr) {
-
-#if 0
+/*
   if (found_image) {
     const std::string* image_filename;
     bool is_system = false;
@@ -574,7 +573,7 @@
         image_filename = &cache_filename;
       }
     }
-#endif
+*/
     {
       // Note that we must not use the file descriptor associated with
       // ScopedFlock::GetFile to Init the image file. We want the file

diff -rU3 romracer/runtime/mirror/art_method.h rovo89/runtime/mirror/art_method.h
--- romracer/runtime/mirror/art_method.h        2015-09-02 22:40:48.842249688 +0200
+++ rovo89/runtime/mirror/art_method.h  2015-09-02 22:45:43.718746165 +0200
@@ -325,7 +325,6 @@
   template <VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
   void SetEntryPointFromQuickCompiledCode(const void* entry_point_from_quick_compiled_code)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
-    DCHECK(!IsXposedHookedMethod());
     CheckObjectSizeEqualsMirrorSize();
     SetEntryPointFromQuickCompiledCodePtrSize(entry_point_from_quick_compiled_code,
                                               sizeof(void*));
@@ -554,6 +553,21 @@

   ALWAYS_INLINE ArtMethod* GetInterfaceMethodIfProxy() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);

+  static size_t SizeWithoutPointerFields(size_t pointer_size) {
+    size_t total = sizeof(ArtMethod) - sizeof(PtrSizedFields);
+#ifdef ART_METHOD_HAS_PADDING_FIELD_ON_64_BIT
+    // Add 4 bytes if 64 bit, otherwise 0.
+    total += pointer_size - sizeof(uint32_t);
+#endif
+    return total;
+  }
+
+  // Size of an instance of java.lang.reflect.ArtMethod not including its value array.
+  static size_t InstanceSize(size_t pointer_size) {
+    return SizeWithoutPointerFields(pointer_size) +
+        (sizeof(PtrSizedFields) / sizeof(void*)) * pointer_size;
+  }
+
   // Xposed
   bool IsXposedHookedMethod() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
     return (GetAccessFlags() & kAccXposedHookedMethod) != 0;
@@ -577,21 +591,6 @@
   static jclass xposed_callback_class;
   static jmethodID xposed_callback_method;

-  static size_t SizeWithoutPointerFields(size_t pointer_size) {
-    size_t total = sizeof(ArtMethod) - sizeof(PtrSizedFields);
-#ifdef ART_METHOD_HAS_PADDING_FIELD_ON_64_BIT
-    // Add 4 bytes if 64 bit, otherwise 0.
-    total += pointer_size - sizeof(uint32_t);
-#endif
-    return total;
-  }
-
-  // Size of an instance of java.lang.reflect.ArtMethod not including its value array.
-  static size_t InstanceSize(size_t pointer_size) {
-    return SizeWithoutPointerFields(pointer_size) +
-        (sizeof(PtrSizedFields) / sizeof(void*)) * pointer_size;
-  }
-
  protected:
   // Field order required by test "ValidateFieldOrderOfJavaCppUnionClasses".
   // The class we are a part of.

diff -rU3 romracer/runtime/mirror/object.cc rovo89/runtime/mirror/object.cc
--- romracer/runtime/mirror/object.cc   2015-09-02 22:40:48.842249688 +0200
+++ rovo89/runtime/mirror/object.cc     2015-09-02 22:45:43.722079496 +0200
@@ -119,10 +119,6 @@
   DISALLOW_COPY_AND_ASSIGN(CopyObjectVisitor);
 };

-Object* Object::Clone(Thread* self) {
-  return Clone(self, 0);
-}
-
 Object* Object::Clone(Thread* self, size_t num_target_bytes) {
   CHECK(!IsClass()) << "Can't clone classes.";
   // Object::SizeOf gets the right size even if we're an array. Using c->AllocObject() here would
diff -rU3 romracer/runtime/mirror/object.h rovo89/runtime/mirror/object.h
--- romracer/runtime/mirror/object.h    2015-09-02 22:40:48.842249688 +0200
+++ rovo89/runtime/mirror/object.h      2015-09-02 22:45:43.722079496 +0200
@@ -102,8 +102,7 @@
            ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
   size_t SizeOf() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);

-  Object* Clone(Thread* self) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-  Object* Clone(Thread* self, size_t num_target_bytes) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+  Object* Clone(Thread* self, size_t num_target_bytes = 0) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);

   int32_t IdentityHashCode() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);

diff -rU3 romracer/runtime/native/dalvik_system_DexFile.cc rovo89/runtime/native/dalvik_system_DexFile.cc
--- romracer/runtime/native/dalvik_system_DexFile.cc    2015-09-02 22:40:48.842249688 +0200
+++ rovo89/runtime/native/dalvik_system_DexFile.cc      2015-09-02 22:45:43.722079496 +0200
@@ -304,6 +304,11 @@
     error_msg.clear();
     return kDexoptNeeded;
   }
+
+  // Pass-up the information about if this is PIC.
+  // TODO: Refactor this function to be less complicated.
+  *oat_is_pic = oat_file->IsPic();
+
   if (!oat_file->GetOatHeader().IsXposedOatVersionValid()) {
     if (kReasonLogging) {
       LOG(INFO) << "DexFile_isDexOptNeeded file " << oat_filename
@@ -312,10 +317,6 @@
     return kDexoptNeeded;
   }

-  // Pass-up the information about if this is PIC.
-  // TODO: Refactor this function to be less complicated.
-  *oat_is_pic = oat_file->IsPic();
-
   bool should_relocate_if_possible = Runtime::Current()->ShouldRelocate();
   uint32_t location_checksum = 0;
   const art::OatFile::OatDexFile* oat_dex_file = oat_file->GetOatDexFile(filename, nullptr,