Mercurial > hg > openjdk > jdk6 > hotspot
changeset 3810:202880d633e6 hs23.2-b05
7170145: C1 doesn't respect the JMM with volatile field loads
Reviewed-by: kvn, roland
author | twisti |
---|---|
date | Fri, 25 May 2012 11:39:13 -0700 |
parents | 168536dbae60 |
children | f681327b10b6 |
files | src/share/vm/c1/c1_ValueMap.hpp |
diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_ValueMap.hpp Thu Jun 07 10:36:11 2012 -0400 +++ b/src/share/vm/c1/c1_ValueMap.hpp Fri May 25 11:39:13 2012 -0700 @@ -141,8 +141,11 @@ // visitor functions void do_StoreField (StoreField* x) { - if (x->is_init_point()) { - // putstatic is an initialization point so treat it as a wide kill + if (x->is_init_point() || // putstatic is an initialization point so treat it as a wide kill + // This is actually too strict and the JMM doesn't require + // this in all cases (e.g. load a; volatile store b; load a) + // but possible future optimizations might require this. + x->field()->is_volatile()) { kill_memory(); } else { kill_field(x->field()); @@ -160,8 +163,8 @@ void do_Local (Local* x) { /* nothing to do */ } void do_Constant (Constant* x) { /* nothing to do */ } void do_LoadField (LoadField* x) { - if (x->is_init_point()) { - // getstatic is an initialization point so treat it as a wide kill + if (x->is_init_point() || // getstatic is an initialization point so treat it as a wide kill + x->field()->is_volatile()) { // the JMM requires this kill_memory(); } }