diff --git a/src/hotspot/share/code/icBuffer.cpp b/src/hotspot/share/code/icBuffer.cpp
index b03554c..ad1308f 100644
--- a/src/hotspot/share/code/icBuffer.cpp
+++ b/src/hotspot/share/code/icBuffer.cpp
@@ -66,7 +66,7 @@ ICRefillVerifier::~ICRefillVerifier() {
 ICRefillVerifierMark::ICRefillVerifierMark(ICRefillVerifier* verifier) {
   Thread* thread = Thread::current();
   assert(thread->missed_ic_stub_refill_mark() == NULL, "nesting not supported");
-  thread->set_missed_ic_stub_refill_mark(this);
+  thread->set_missed_ic_stub_refill_mark(verifier);
 }
 
 ICRefillVerifierMark::~ICRefillVerifierMark() {
@@ -75,7 +75,7 @@ ICRefillVerifierMark::~ICRefillVerifierMark() {
 
 static ICRefillVerifier* current_ic_refill_verifier() {
   Thread* current = Thread::current();
-  ICRefillVerifier* verifier = reinterpret_cast<ICRefillVerifier*>(current->missed_ic_stub_refill_mark());
+  ICRefillVerifier* verifier = current->missed_ic_stub_refill_mark();
   assert(verifier != NULL, "need a verifier for safety");
   return verifier;
 }