truffle: src/share/vm/opto/output.cpp comparison

7032963: StoreCM shouldn't participate in store elimination Reviewed-by: kvn

comparison

equal deleted inserted replaced

-:8f1042ff784d
+:e6beb62de02d
 #ifdef ASSERT
 // Check that oop-store precedes the card-mark
 else if( mach->ideal_Opcode() == Op_StoreCM ) {
 uint storeCM_idx = j;
-Node *oop_store = mach->in(mach->_cnt);  // First precedence edge
+int count = 0;
-assert( oop_store != NULL, "storeCM expects a precedence edge");
+for (uint prec = mach->req(); prec < mach->len(); prec++) {
-uint i4;
+Node *oop_store = mach->in(prec);  // Precedence edge
-for( i4 = 0; i4 < last_inst; ++i4 ) {
+if (oop_store == NULL) continue;
-if( b->_nodes[i4] == oop_store ) break;
+count++;
+uint i4;
+for( i4 = 0; i4 < last_inst; ++i4 ) {
+if( b->_nodes[i4] == oop_store ) break;
+}
+// Note: This test can provide a false failure if other precedence
+// edges have been added to the storeCMNode.
+assert( i4 == last_inst || i4 < storeCM_idx, "CM card-mark executes before oop-store");
 }
-// Note: This test can provide a false failure if other precedence
+assert(count > 0, "storeCM expects at least one precedence edge");
-// edges have been added to the storeCMNode.
-assert( i4 == last_inst || i4 < storeCM_idx, "CM card-mark executes before oop-store");
 }
 #endif
 else if( !n->is_Proj() ) {
 // Remember the beginning of the previous instruction, in case

Mercurial > hg > truffle