Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/macro.cpp	Mon Aug 08 13:19:46 2011 -0700
     1.2 +++ b/src/share/vm/opto/macro.cpp	Tue Aug 02 18:36:40 2011 +0200
     1.3 @@ -1816,9 +1816,9 @@
     1.4    // The input to a Lock is merged memory, so extract its RawMem input
     1.5    // (unless the MergeMem has been optimized away.)
     1.6    if (alock->is_Lock()) {
     1.7 -    // Seach for MemBarAcquire node and delete it also.
     1.8 +    // Seach for MemBarAcquireLock node and delete it also.
     1.9      MemBarNode* membar = fallthroughproj->unique_ctrl_out()->as_MemBar();
    1.10 -    assert(membar != NULL && membar->Opcode() == Op_MemBarAcquire, "");
    1.11 +    assert(membar != NULL && membar->Opcode() == Op_MemBarAcquireLock, "");
    1.12      Node* ctrlproj = membar->proj_out(TypeFunc::Control);
    1.13      Node* memproj = membar->proj_out(TypeFunc::Memory);
    1.14      _igvn.replace_node(ctrlproj, fallthroughproj);
    1.15 @@ -1833,11 +1833,11 @@
    1.16      }
    1.17    }
    1.18  
    1.19 -  // Seach for MemBarRelease node and delete it also.
    1.20 +  // Seach for MemBarReleaseLock node and delete it also.
    1.21    if (alock->is_Unlock() && ctrl != NULL && ctrl->is_Proj() &&
    1.22        ctrl->in(0)->is_MemBar()) {
    1.23      MemBarNode* membar = ctrl->in(0)->as_MemBar();
    1.24 -    assert(membar->Opcode() == Op_MemBarRelease &&
    1.25 +    assert(membar->Opcode() == Op_MemBarReleaseLock &&
    1.26             mem->is_Proj() && membar == mem->in(0), "");
    1.27      _igvn.replace_node(fallthroughproj, ctrl);
    1.28      _igvn.replace_node(memproj_fallthrough, mem);