Mercurial > hg > truffle

diff src/share/vm/opto/graphKit.cpp @ 1594:b9bc732be7c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jmasa
date Thu, 10 Jun 2010 08:27:35 -0700
parents c18cbe5936b8 2458a1f25356
children 4311f23817fd
line wrap: on
line diff
--- a/src/share/vm/opto/graphKit.cpp	Wed Jun 09 13:53:58 2010 -0400
+++ b/src/share/vm/opto/graphKit.cpp	Thu Jun 10 08:27:35 2010 -0700
@@ -3487,7 +3487,6 @@
 
   Node* tls = __ thread(); // ThreadLocalStorage
 
-  Node* no_ctrl = NULL;
   Node* no_base = __ top();
   float likely  = PROB_LIKELY(0.999);
   float unlikely  = PROB_UNLIKELY(0.999);
@@ -3511,10 +3510,10 @@
   Node* index_adr =  __ AddP(no_base, tls, __ ConX(index_offset));
 
   // Now some values
-
-  Node* index  = __ load(no_ctrl, index_adr, TypeInt::INT, T_INT, Compile::AliasIdxRaw);
-  Node* buffer = __ load(no_ctrl, buffer_adr, TypeRawPtr::NOTNULL, T_ADDRESS, Compile::AliasIdxRaw);
-
+  // Use ctrl to avoid hoisting these values past a safepoint, which could
+  // potentially reset these fields in the JavaThread.
+  Node* index  = __ load(__ ctrl(), index_adr, TypeInt::INT, T_INT, Compile::AliasIdxRaw);
+  Node* buffer = __ load(__ ctrl(), buffer_adr, TypeRawPtr::NOTNULL, T_ADDRESS, Compile::AliasIdxRaw);
 
   // Convert the store obj pointer to an int prior to doing math on it
   // Must use ctrl to prevent "integerized oop" existing across safepoint