commit 6f54cf2a63bdd46b97c834f3af89bdc918740f23
author Chang Xing <chxing@google.com> Fri Jul 14 09:59:01 2017 -0700
committer Chang Xing <chxing@google.com> Fri Jul 14 10:08:37 2017 -0700
tree 2a77eecf39cc85fa396eb0ffbaa1be87ceda1ef1
parent 469a27f535a7f57444690fa8f5f5ded824fe2caa

Fix ReadBarrier misuse when relocating the image.

Specify not to use ReadBarrier when calling to GetSuperClass during
relocation.

Bug: 63691502
Test: test/testrunner/testrunner.py -b --host -t \
      test-art-host-run-test-debug-prebuild-optimizing-no-relocate-\
      ntrace-gcstress-checkjni-picimage-npictest-ndebuggable-no-jvmti-\
      626-const-class-linking64

Change-Id: I9fbfdd4ffa2c7489da2e3c62af4f196ec07e562e

runtime/gc/space/image_space.cc

diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index b229b6c..3ae382e 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -1012,7 +1012,7 @@
         mirror::Class* klass = obj->AsClass<kVerifyNone, kWithoutReadBarrier>();
         // Fixup super class before visiting instance fields which require
         // information from their super class to calculate offsets.
-        mirror::Class* super_class = klass->GetSuperClass();
+        mirror::Class* super_class = klass->GetSuperClass<kVerifyNone, kWithoutReadBarrier>();
         if (super_class != nullptr) {
           mirror::Class* new_super_class = down_cast<mirror::Class*>(ForwardObject(super_class));
           if (new_super_class != super_class && IsInAppImage(new_super_class)) {