--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Wed Aug 23 10:25:25 2017 +0200
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Wed Aug 23 14:52:55 2017 -0400
@@ -209,7 +209,7 @@
assert(false, "should be optimized out");
return;
}
- assert(orig->is_oop(true /* ignore mark word */), "Error");
+ assert(oopDesc::is_oop(orig, true /* ignore mark word */), "Error");
// store the original value that was in the field reference
thread->satb_mark_queue().enqueue(orig);
JRT_END
@@ -585,7 +585,7 @@
int args_size = ArgumentSizeComputer(sig).size() + 1;
assert(args_size <= caller.interpreter_frame_expression_stack_size(), "receiver must be on interpreter stack");
oop result = cast_to_oop(*caller.interpreter_frame_tos_at(args_size - 1));
- assert(Universe::heap()->is_in(result) && result->is_oop(), "receiver must be an oop");
+ assert(Universe::heap()->is_in(result) && oopDesc::is_oop(result), "receiver must be an oop");
return result;
}
@@ -997,7 +997,7 @@
return;
}
#endif // INCLUDE_JVMCI
- assert(obj->is_oop(), "must be a valid oop");
+ assert(oopDesc::is_oop(obj), "must be a valid oop");
assert(obj->klass()->has_finalizer(), "shouldn't be here otherwise");
InstanceKlass::register_finalizer(instanceOop(obj), CHECK);
JRT_END
@@ -1165,8 +1165,6 @@
}
}
- assert(receiver.is_null() || receiver->is_oop(), "wrong receiver");
-
// Resolve method
if (attached_method.not_null()) {
// Parameterized by attached method.