Mercurial > hg > truffle

diff src/share/vm/opto/macro.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 d3f3f7677537
line wrap: on
line diff
--- a/src/share/vm/opto/macro.cpp	Wed Nov 19 12:52:56 2014 -0800
+++ b/src/share/vm/opto/macro.cpp	Wed Nov 26 08:14:21 2014 -0800
@@ -2194,7 +2194,7 @@
     Node* klass_node = AllocateNode::Ideal_klass(obj, &_igvn);
     if (klass_node == NULL) {
       Node* k_adr = basic_plus_adr(obj, oopDesc::klass_offset_in_bytes());
-      klass_node = transform_later( LoadKlassNode::make(_igvn, mem, k_adr, _igvn.type(k_adr)->is_ptr()) );
+      klass_node = transform_later(LoadKlassNode::make(_igvn, NULL, mem, k_adr, _igvn.type(k_adr)->is_ptr()));
 #ifdef _LP64
       if (UseCompressedClassPointers && klass_node->is_DecodeNKlass()) {
         assert(klass_node->in(1)->Opcode() == Op_LoadNKlass, "sanity");