--- old/src/cpu/sparc/vm/nativeInst_sparc.cpp	2010-05-10 08:59:39.841636551 -0700
+++ new/src/cpu/sparc/vm/nativeInst_sparc.cpp	2010-05-10 08:59:39.347406598 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2010 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -321,8 +321,10 @@
   set_long_at(add_offset,   set_data32_simm13( long_at(add_offset),   x));
 
   // also store the value into an oop_Relocation cell, if any
-  CodeBlob* nm = CodeCache::find_blob(instruction_address());
-  if (nm != NULL) {
+  CodeBlob* cb = CodeCache::find_blob(instruction_address());
+  if (cb != NULL) {
+    nmethod* nm = cb->as_nmethod_or_null();
+    assert(nm, "must be");
     RelocIterator iter(nm, instruction_address(), next_instruction_address());
     oop* oop_addr = NULL;
     while (iter.next()) {
@@ -430,8 +432,10 @@
   set_long_at(add_offset, set_data32_simm13(long_at(add_offset), x));
 
   // also store the value into an oop_Relocation cell, if any
-  CodeBlob* nm = CodeCache::find_blob(instruction_address());
-  if (nm != NULL) {
+  CodeBlob* cb = CodeCache::find_blob(instruction_address());
+  if (cb != NULL) {
+    nmethod* nm = cb->as_nmethod_or_null();
+    assert(nm, "must be");
     RelocIterator iter(nm, instruction_address(), next_instruction_address());
     oop* oop_addr = NULL;
     while (iter.next()) {