Mercurial > hg > truffle

diff src/share/vm/opto/parse1.cpp @ 20771:9fa3bf3043a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/parse1.cpp	Wed Nov 19 12:52:56 2014 -0800
+++ b/src/share/vm/opto/parse1.cpp	Wed Nov 26 08:14:21 2014 -0800
@@ -1958,7 +1958,7 @@
   // finalization.  In general this will fold up since the concrete
   // class is often visible so the access flags are constant.
   Node* klass_addr = basic_plus_adr( receiver, receiver, oopDesc::klass_offset_in_bytes() );
-  Node* klass = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), klass_addr, TypeInstPtr::KLASS) );
+  Node* klass = _gvn.transform(LoadKlassNode::make(_gvn, NULL, immutable_memory(), klass_addr, TypeInstPtr::KLASS));
 
   Node* access_flags_addr = basic_plus_adr(klass, klass, in_bytes(Klass::access_flags_offset()));
   Node* access_flags = make_load(NULL, access_flags_addr, TypeInt::INT, T_INT, MemNode::unordered);