changeset 22525:d77654050ba4

Move assert in SharedRuntime::register_finalizer.
author twisti
date Wed, 02 Sep 2015 12:51:21 -1000
parents ce7078904238
children 0251714a52fe
files src/share/vm/runtime/sharedRuntime.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp	Fri Sep 04 19:22:19 2015 +0200
+++ b/src/share/vm/runtime/sharedRuntime.cpp	Wed Sep 02 12:51:21 2015 -1000
@@ -1013,6 +1013,7 @@
 
 
 JRT_ENTRY_NO_ASYNC(void, SharedRuntime::register_finalizer(JavaThread* thread, oopDesc* obj))
+  assert(obj->is_oop(), "must be a valid oop");
 #if INCLUDE_JVMCI
   // This removes the requirement for JVMCI compilers to emit code
   // performing a dynamic check that obj has a finalizer before
@@ -1023,7 +1024,6 @@
     return;
   }
 #endif
-  assert(obj->is_oop(), "must be a valid oop");
   assert(obj->klass()->has_finalizer(), "shouldn't be here otherwise");
   InstanceKlass::register_finalizer(instanceOop(obj), CHECK);
 JRT_END