commit fb7a0b4e898a88079ddd335b2d864fe04a32766a
author Nicolas Geoffray <ngeoffray@google.com> Wed Jun 29 08:19:04 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jun 29 08:19:04 2016 +0000
tree e183af7d3312f365a04997a43692c9f8bfcfe647
parent efeb9f01308c5c4b723ff905cf5bea1636f7a549

Revert "Propagate flags to ShouldHaveEmbeddedVTable"

Bug: 29188168 (for initial CL)
Bug: 29778499 (reason for revert)

This reverts commit efeb9f01308c5c4b723ff905cf5bea1636f7a549.

Change-Id: I21bc32fa07014bbce2eedba3686f09d3d45aec65

runtime/mirror/class.h

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