1.1 --- a/src/share/vm/prims/unsafe.cpp Wed Sep 25 17:47:51 2013 +0200
1.2 +++ b/src/share/vm/prims/unsafe.cpp Thu Sep 26 10:25:02 2013 -0400
1.3 @@ -292,9 +292,9 @@
1.4 volatile oop v;
1.5 if (UseCompressedOops) {
1.6 volatile narrowOop n = *(volatile narrowOop*) addr;
1.7 - v = oopDesc::decode_heap_oop(n);
1.8 + (void)const_cast<oop&>(v = oopDesc::decode_heap_oop(n));
1.9 } else {
1.10 - v = *(volatile oop*) addr;
1.11 + (void)const_cast<oop&>(v = *(volatile oop*) addr);
1.12 }
1.13 OrderAccess::acquire();
1.14 return JNIHandles::make_local(env, v);
1.15 @@ -1222,9 +1222,9 @@
1.16 #endif /* USDT2 */
1.17 if (event.should_commit()) {
1.18 oop obj = thread->current_park_blocker();
1.19 - event.set_klass(obj ? obj->klass() : NULL);
1.20 + event.set_klass((obj != NULL) ? obj->klass() : NULL);
1.21 event.set_timeout(time);
1.22 - event.set_address(obj ? (TYPE_ADDRESS) (uintptr_t) obj : 0);
1.23 + event.set_address((obj != NULL) ? (TYPE_ADDRESS) cast_from_oop<uintptr_t>(obj) : 0);
1.24 event.commit();
1.25 }
1.26 UNSAFE_END
