Mercurial > hg > truffle

diff src/share/vm/opto/macro.cpp @ 1609:4311f23817fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6959430: Make sure raw loads have control edge Summary: check that raw loads have control edge Reviewed-by: never, twisti
author kvn
date Tue, 15 Jun 2010 18:07:27 -0700
parents c18cbe5936b8
children 6027dddc26c6
line wrap: on
line diff
--- a/src/share/vm/opto/macro.cpp	Tue Jun 15 15:57:36 2010 -0700
+++ b/src/share/vm/opto/macro.cpp	Tue Jun 15 18:07:27 2010 -0700
@@ -1431,7 +1431,7 @@
   Node* mark_node = NULL;
   // For now only enable fast locking for non-array types
   if (UseBiasedLocking && (length == NULL)) {
-    mark_node = make_load(NULL, rawmem, klass_node, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), TypeRawPtr::BOTTOM, T_ADDRESS);
+    mark_node = make_load(control, rawmem, klass_node, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), TypeRawPtr::BOTTOM, T_ADDRESS);
   } else {
     mark_node = makecon(TypeRawPtr::make((address)markOopDesc::prototype()));
   }