diff src/share/vm/c1/c1_LIRAssembler.hpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 701a83c86f28
children da91efe96a93
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRAssembler.hpp	Fri Feb 24 18:30:42 2012 -0800
+++ b/src/share/vm/c1/c1_LIRAssembler.hpp	Mon Feb 27 13:10:13 2012 +0100
@@ -241,6 +241,10 @@
   void membar();
   void membar_acquire();
   void membar_release();
+  void membar_loadload();
+  void membar_storestore();
+  void membar_loadstore();
+  void membar_storeload();
   void get_thread(LIR_Opr result);
 
   void verify_oop_map(CodeEmitInfo* info);