src/cpu/x86/vm/x86_64.ad

rev 2570 : imported patch membar2
rev 2571 : [mq]: membar3

@@ -7374,12 +7374,11 @@
   ins_pipe(empty);
 %}
 
 instruct membar_acquire_lock()
 %{
-  match(MemBarAcquire);
-  predicate(Matcher::prior_fast_lock(n));
+  match(MemBarAcquireLock);
   ins_cost(0);
 
   size(0);
   format %{ "MEMBAR-acquire (prior CMPXCHG in FastLock so empty encoding)" %}
   ins_encode();

@@ -7397,12 +7396,11 @@
   ins_pipe(empty);
 %}
 
 instruct membar_release_lock()
 %{
-  match(MemBarRelease);
-  predicate(Matcher::post_fast_unlock(n));
+  match(MemBarReleaseLock);
   ins_cost(0);
 
   size(0);
   format %{ "MEMBAR-release (a FastUnlock follows so empty encoding)" %}
   ins_encode();