OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
efeb9f0
)
Revert "Propagate flags to ShouldHaveEmbeddedVTable"
author
Nicolas Geoffray
<ngeoffray@google.com>
Wed, 29 Jun 2016 08:19:04 +0000
(08:19 +0000)
committer
Nicolas Geoffray
<ngeoffray@google.com>
Wed, 29 Jun 2016 08:19:04 +0000
(08:19 +0000)
Bug:
29188168
(for initial CL)
Bug:
29778499
(reason for revert)
This reverts commit
efeb9f01308c5c4b723ff905cf5bea1636f7a549
.
Change-Id: I21bc32fa07014bbce2eedba3686f09d3d45aec65
runtime/mirror/class.h
patch
|
blob
|
history
diff --git
a/runtime/mirror/class.h
b/runtime/mirror/class.h
index
2adf54a
..
9670acc
100644
(file)
--- a/
runtime/mirror/class.h
+++ b/
runtime/mirror/class.h
@@
-831,8
+831,7
@@
class MANAGED Class FINAL : public Object {
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,