commit efeb9f01308c5c4b723ff905cf5bea1636f7a549
author Mathieu Chartier <mathieuc@google.com> Wed Jun 15 15:07:03 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Jun 15 17:55:27 2016 -0700
tree 66b6436c16249dd85625e438f131876615bd7496
parent edbcf54199cab8557f93ef3d136e4c2f335b915e

Propagate flags to ShouldHaveEmbeddedVTable

Pass kVerifyFlags and kReadBarrierrOption to ShouldHaveEmbeddedVTable
from ShouldHaveImt.

Bug: 29188168

Change-Id: Ibddd6e744a2f313b4048719987c41f2da04a4e0a

runtime/mirror/class.h

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 9670acc..2adf54a 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -831,7 +831,8 @@
            ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
   bool ShouldHaveImt() SHARED_REQUIRES(Locks::mutator_lock_) {
     return ShouldHaveEmbeddedVTable<kVerifyFlags, kReadBarrierOption>() &&
-        GetIfTable() != nullptr && !IsArrayClass();
+        GetIfTable<kVerifyFlags, kReadBarrierOption>() != nullptr &&
+        !IsArrayClass<kVerifyFlags, kReadBarrierOption>();
   }
 
   template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,