Mercurial > hg > truffle
diff src/share/vm/opto/graphKit.cpp @ 20771:9fa3bf3043a2
Merge
| author | asaha |
|---|---|
| date | Wed, 26 Nov 2014 08:14:21 -0800 |
| parents | e7b3d177adda |
| children | 7848fc12602b |
line wrap: on
line diff
--- a/src/share/vm/opto/graphKit.cpp Wed Nov 19 12:52:56 2014 -0800 +++ b/src/share/vm/opto/graphKit.cpp Wed Nov 26 08:14:21 2014 -0800 @@ -1150,7 +1150,7 @@ Node* akls = AllocateNode::Ideal_klass(obj, &_gvn); if (akls != NULL) return akls; Node* k_adr = basic_plus_adr(obj, oopDesc::klass_offset_in_bytes()); - return _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), k_adr, TypeInstPtr::KLASS) ); + return _gvn.transform(LoadKlassNode::make(_gvn, NULL, immutable_memory(), k_adr, TypeInstPtr::KLASS)); } //-------------------------load_array_length----------------------------------- @@ -2542,7 +2542,7 @@ // cache which is mutable so can't use immutable memory. Other // types load from the super-class display table which is immutable. Node *kmem = might_be_cache ? memory(p2) : immutable_memory(); - Node *nkls = _gvn.transform( LoadKlassNode::make( _gvn, kmem, p2, _gvn.type(p2)->is_ptr(), TypeKlassPtr::OBJECT_OR_NULL ) ); + Node* nkls = _gvn.transform(LoadKlassNode::make(_gvn, NULL, kmem, p2, _gvn.type(p2)->is_ptr(), TypeKlassPtr::OBJECT_OR_NULL)); // Compile speed common case: ARE a subtype and we canNOT fail if( superklass == nkls )