--- a/hotspot/src/share/vm/opto/memnode.cpp Mon Aug 08 13:19:46 2011 -0700
+++ b/hotspot/src/share/vm/opto/memnode.cpp Tue Aug 02 18:36:40 2011 +0200
@@ -925,8 +925,9 @@
// a synchronized region.
while (current->is_Proj()) {
int opc = current->in(0)->Opcode();
- if ((final && opc == Op_MemBarAcquire) ||
- opc == Op_MemBarRelease || opc == Op_MemBarCPUOrder) {
+ if ((final && (opc == Op_MemBarAcquire || opc == Op_MemBarAcquireLock)) ||
+ opc == Op_MemBarRelease || opc == Op_MemBarCPUOrder ||
+ opc == Op_MemBarReleaseLock) {
Node* mem = current->in(0)->in(TypeFunc::Memory);
if (mem->is_MergeMem()) {
MergeMemNode* merge = mem->as_MergeMem();
@@ -2666,6 +2667,8 @@
switch (opcode) {
case Op_MemBarAcquire: return new(C, len) MemBarAcquireNode(C, atp, pn);
case Op_MemBarRelease: return new(C, len) MemBarReleaseNode(C, atp, pn);
+ case Op_MemBarAcquireLock: return new(C, len) MemBarAcquireLockNode(C, atp, pn);
+ case Op_MemBarReleaseLock: return new(C, len) MemBarReleaseLockNode(C, atp, pn);
case Op_MemBarVolatile: return new(C, len) MemBarVolatileNode(C, atp, pn);
case Op_MemBarCPUOrder: return new(C, len) MemBarCPUOrderNode(C, atp, pn);
case Op_Initialize: return new(C, len) InitializeNode(C, atp, pn);