diff -r 2fbbde433861 -r e4df2f64bb2e hotspot/src/share/vm/runtime/thread.cpp --- a/hotspot/src/share/vm/runtime/thread.cpp Wed May 28 22:59:29 2014 +0200 +++ b/hotspot/src/share/vm/runtime/thread.cpp Thu May 29 08:58:51 2014 -0400 @@ -1434,7 +1434,7 @@ _in_deopt_handler = 0; _doing_unsafe_access = false; _stack_guard_state = stack_guard_unused; - (void)const_cast(_exception_oop = NULL); + (void)const_cast(_exception_oop = oop(NULL)); _exception_pc = 0; _exception_handler_pc = 0; _is_method_handle_return = 0;