Mercurial > hg > truffle

diff src/share/vm/c1/c1_LIRGenerator.cpp @ 2352:425688247f3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6965570: assert(!needs_patching && x->is_loaded(),"how do we know it's volatile if it's not loaded") Reviewed-by: iveresov
author never
date Sun, 06 Mar 2011 22:09:23 -0800
parents aa4b04b68652
children 8033953d67ff
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRGenerator.cpp	Sat Mar 05 11:02:04 2011 -0800
+++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Sun Mar 06 22:09:23 2011 -0800
@@ -1559,9 +1559,7 @@
                 (info ? new CodeEmitInfo(info) : NULL));
   }
 
-  if (is_volatile) {
-    assert(!needs_patching && x->is_loaded(),
-           "how do we know it's volatile if it's not loaded");
+  if (is_volatile && !needs_patching) {
     volatile_field_store(value.result(), address, info);
   } else {
     LIR_PatchCode patch_code = needs_patching ? lir_patch_normal : lir_patch_none;
@@ -1627,9 +1625,7 @@
     address = generate_address(object.result(), x->offset(), field_type);
   }
 
-  if (is_volatile) {
-    assert(!needs_patching && x->is_loaded(),
-           "how do we know it's volatile if it's not loaded");
+  if (is_volatile && !needs_patching) {
     volatile_field_load(address, reg, info);
   } else {
     LIR_PatchCode patch_code = needs_patching ? lir_patch_normal : lir_patch_none;