1.1 --- a/src/share/vm/opto/memnode.cpp Wed May 28 21:06:24 2008 -0700
1.2 +++ b/src/share/vm/opto/memnode.cpp Thu May 29 12:04:14 2008 -0700
1.3 @@ -1625,14 +1625,10 @@
1.4 const TypeNarrowOop* narrowtype = tk->is_oopptr()->make_narrowoop();
1.5 Node* load_klass = gvn.transform(new (C, 3) LoadNKlassNode(ctl, mem, adr, at, narrowtype));
1.6 return DecodeNNode::decode(&gvn, load_klass);
1.7 - } else
1.8 + }
1.9 #endif
1.10 - {
1.11 - assert(!adr_type->is_ptr_to_narrowoop(), "should have got back a narrow oop");
1.12 - return new (C, 3) LoadKlassNode(ctl, mem, adr, at, tk);
1.13 - }
1.14 - ShouldNotReachHere();
1.15 - return (LoadKlassNode*)NULL;
1.16 + assert(!adr_type->is_ptr_to_narrowoop(), "should have got back a narrow oop");
1.17 + return new (C, 3) LoadKlassNode(ctl, mem, adr, at, tk);
1.18 }
1.19
1.20 //------------------------------Value------------------------------------------
