--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Sat Mar 05 11:02:04 2011 -0800
+++ b/hotspot/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;