From 8ca4e4e7a55f7a7079ec1f95a3188d9df434704b Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 3 Feb 2017 15:12:38 +0000 Subject: Clean up art::mirror::Class::SetSuperClass. - Move its definition from runtime/mirror/class.h to runtime/mirror/class-inl.h. - Prevent debug code from running in non-debug mode. Test: test-art-host Change-Id: I981cb9aa5c59c75c6a1c4d2145185cf8b147e2db --- runtime/mirror/class.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'runtime/mirror/class.h') diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index c9f27ad53f..2ed2d878be 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -683,14 +683,7 @@ class MANAGED Class FINAL : public Object { // `This` and `klass` must be classes. ObjPtr GetCommonSuperClass(Handle klass) REQUIRES_SHARED(Locks::mutator_lock_); - void SetSuperClass(ObjPtr new_super_class) REQUIRES_SHARED(Locks::mutator_lock_) { - // Super class is assigned once, except during class linker initialization. - ObjPtr old_super_class = - GetFieldObject(OFFSET_OF_OBJECT_MEMBER(Class, super_class_)); - DCHECK(old_super_class == nullptr || old_super_class == new_super_class); - DCHECK(new_super_class != nullptr); - SetFieldObject(OFFSET_OF_OBJECT_MEMBER(Class, super_class_), new_super_class); - } + void SetSuperClass(ObjPtr new_super_class) REQUIRES_SHARED(Locks::mutator_lock_); bool HasSuperClass() REQUIRES_SHARED(Locks::mutator_lock_) { return GetSuperClass() != nullptr; -- cgit v1.2.3-59-g8ed1b