# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1444664859 25200
# Node ID 9c2d52a1a921cbe17380834d9383dbdbbdf15ca8
# Parent  3596054515916b3aa299386f6e2dcbbbfc5621f1
ConstantPoolCacheEntry::set_field avoid rescheduling store f1/f2 and store of bytecodes by the compiler (Store/Store)

diff -r 359605451591 -r 9c2d52a1a921 mx.jvmci/mx_jvmci.py
--- a/mx.jvmci/mx_jvmci.py	Sun Oct 11 14:30:03 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Mon Oct 12 08:47:39 2015 -0700
@@ -924,7 +924,7 @@
             if mx.get_os() == 'linux' and platform.processor() == 'sparc64':
                 # SPARC/Linux
                 setMakeVar("DEBUG_BINARIES", "true", env=env)
-                setMakeVar("EXTRA_CFLAGS", "-Wno-conversion-null -Wno-int-to-pointer-cast -Wno-unused-function -fno-tree-loop-distribute-patterns -fno-schedule-insns -fno-schedule-insns2 -fno-tree-bit-ccp", env=env)
+                setMakeVar("EXTRA_CFLAGS", "-Wno-conversion-null -Wno-int-to-pointer-cast -Wno-unused-function -fno-tree-loop-distribute-patterns", env=env)
 
             setMakeVar('MAKE_VERBOSE', 'y' if mx._opts.verbose else '')
             if self.vm.endswith('nojvmci'):
diff -r 359605451591 -r 9c2d52a1a921 src/share/vm/oops/cpCache.cpp
--- a/src/share/vm/oops/cpCache.cpp	Sun Oct 11 14:30:03 2015 +0200
+++ b/src/share/vm/oops/cpCache.cpp	Mon Oct 12 08:47:39 2015 -0700
@@ -120,6 +120,7 @@
                   ((is_volatile ? 1 : 0) << is_volatile_shift) |
                   ((is_final    ? 1 : 0) << is_final_shift),
                   field_index);
+  OrderAccess::storestore();
   set_bytecode_1(get_code);
   set_bytecode_2(put_code);
   NOT_PRODUCT(verify(tty));