--- a/hotspot/src/share/vm/opto/memnode.cpp	Wed May 28 21:06:24 2008 -0700
+++ b/hotspot/src/share/vm/opto/memnode.cpp	Thu May 29 12:04:14 2008 -0700
@@ -1625,14 +1625,10 @@
     const TypeNarrowOop* narrowtype = tk->is_oopptr()->make_narrowoop();
     Node* load_klass = gvn.transform(new (C, 3) LoadNKlassNode(ctl, mem, adr, at, narrowtype));
     return DecodeNNode::decode(&gvn, load_klass);
-  } else
+  }
 #endif
-  {
-    assert(!adr_type->is_ptr_to_narrowoop(), "should have got back a narrow oop");
-    return new (C, 3) LoadKlassNode(ctl, mem, adr, at, tk);
-  }
-  ShouldNotReachHere();
-  return (LoadKlassNode*)NULL;
+  assert(!adr_type->is_ptr_to_narrowoop(), "should have got back a narrow oop");
+  return new (C, 3) LoadKlassNode(ctl, mem, adr, at, tk);
 }
 
 //------------------------------Value------------------------------------------