diff options
author | 2019-12-03 08:47:26 +0000 | |
---|---|---|
committer | 2019-12-03 08:47:45 +0000 | |
commit | 664999a12d6fc8a8ef5c0519b12ec1e8a51bb085 (patch) | |
tree | f4ae1b0844ac075807229db9695ead7dec07ff8a /runtime/mirror/class.h | |
parent | 642af13b1b14794d8ab0db5cc82206213e648fa1 (diff) |
Revert "Revert^2 "Allow structural redefinition on non-final classes.""
This reverts commit f1b809ce611e943f926fff97cefe0930226ffcc2.
Reason for revert: Tests still fail
Bug: 134162467
Bug: 144168550
Change-Id: Icdebc826b8630920b716afbfd6f338a29669fcc2
Diffstat (limited to 'runtime/mirror/class.h')
-rw-r--r-- | runtime/mirror/class.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index f5c2614908..a8b8235ee3 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -105,10 +105,6 @@ class MANAGED Class final : public Object { static void SetStatus(Handle<Class> h_this, ClassStatus new_status, Thread* self) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); - // Used for structural redefinition to directly set the class-status while - // holding a strong mutator-lock. - void SetStatusLocked(ClassStatus new_status) REQUIRES(Locks::mutator_lock_); - void SetStatusForPrimitiveOrArray(ClassStatus new_status) REQUIRES_SHARED(Locks::mutator_lock_); static constexpr MemberOffset StatusOffset() { @@ -621,11 +617,6 @@ class MANAGED Class final : public Object { // to themselves. Classes for primitive types may not assign to each other. ALWAYS_INLINE bool IsAssignableFrom(ObjPtr<Class> src) REQUIRES_SHARED(Locks::mutator_lock_); - // Checks if 'klass' is a redefined version of this. - bool IsObsoleteVersionOf(ObjPtr<Class> klass) REQUIRES_SHARED(Locks::mutator_lock_); - - ObjPtr<Class> GetObsoleteClass() REQUIRES_SHARED(Locks::mutator_lock_); - template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags, ReadBarrierOption kReadBarrierOption = kWithReadBarrier> ALWAYS_INLINE ObjPtr<Class> GetSuperClass() REQUIRES_SHARED(Locks::mutator_lock_); |