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

     1.1 --- a/src/share/vm/opto/macro.cpp	Tue Mar 05 18:03:36 2013 -0800
     1.2 +++ b/src/share/vm/opto/macro.cpp	Wed Mar 06 10:28:38 2013 +0100
     1.3 @@ -1101,12 +1101,6 @@
     1.4    Node* klass_node        = alloc->in(AllocateNode::KlassNode);
     1.5    Node* initial_slow_test = alloc->in(AllocateNode::InitialTest);
     1.6  
     1.7 -  Node* storestore = alloc->storestore();
     1.8 -  if (storestore != NULL) {
     1.9 -    // Break this link that is no longer useful and confuses register allocation
    1.10 -    storestore->set_req(MemBarNode::Precedent, top());
    1.11 -  }
    1.12 -
    1.13    assert(ctrl != NULL, "must have control");
    1.14    // We need a Region and corresponding Phi's to merge the slow-path and fast-path results.
    1.15    // they will not be used if "always_slow" is set
    1.16 @@ -1324,7 +1318,7 @@
    1.17          // No InitializeNode or no stores captured by zeroing
    1.18          // elimination. Simply add the MemBarStoreStore after object
    1.19          // initialization.
    1.20 -        MemBarNode* mb = MemBarNode::make(C, Op_MemBarStoreStore, Compile::AliasIdxBot, fast_oop_rawmem);
    1.21 +        MemBarNode* mb = MemBarNode::make(C, Op_MemBarStoreStore, Compile::AliasIdxBot);
    1.22          transform_later(mb);
    1.23  
    1.24          mb->init_req(TypeFunc::Memory, fast_oop_rawmem);