src/hotspot/share/opto/compile.cpp

rev 52415 : 8213384: Move G1/C2 barrier verification into G1BarrierSetC2

*** 890,900 ****
        xtty->tail("ideal");
      }
    }
  #endif
  
!   NOT_PRODUCT( verify_barriers(); )
  
    // Dump compilation data to replay it.
    if (directive->DumpReplayOption) {
      env()->dump_replay_data(_compile_id);
    }
--- 890,903 ----
        xtty->tail("ideal");
      }
    }
  #endif
  
! #ifdef ASSERT
!   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!   bs->verify_gc_barriers(this, BarrierSetC2::BeforeCodeGen);
! #endif
  
    // Dump compilation data to replay it.
    if (directive->DumpReplayOption) {
      env()->dump_replay_data(_compile_id);
    }
*** 2191,2201 ****
  
  #endif
  
  #ifdef ASSERT
    BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!   bs->verify_gc_barriers(true);
  #endif
  
    ResourceMark rm;
    int          loop_opts_cnt;
  
--- 2194,2204 ----
  
  #endif
  
  #ifdef ASSERT
    BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!   bs->verify_gc_barriers(this, BarrierSetC2::BeforeOptimize);
  #endif
  
    ResourceMark rm;
    int          loop_opts_cnt;
  
*** 2384,2394 ****
      igvn.optimize();
    }
  
  #ifdef ASSERT
    BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!   bs->verify_gc_barriers(false);
  #endif
  
    {
      TracePhase tp("macroExpand", &timers[_t_macroExpand]);
      PhaseMacroExpand  mex(igvn);
--- 2387,2397 ----
      igvn.optimize();
    }
  
  #ifdef ASSERT
    BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
!   bs->verify_gc_barriers(this, BarrierSetC2::BeforeExpand);
  #endif
  
    {
      TracePhase tp("macroExpand", &timers[_t_macroExpand]);
      PhaseMacroExpand  mex(igvn);
*** 3829,3906 ****
        }
        assert(!dead_nodes, "using nodes must be reachable from root");
      }
    }
  }
- 
- // Verify GC barriers consistency
- // Currently supported:
- // - G1 pre-barriers (see GraphKit::g1_write_barrier_pre())
- void Compile::verify_barriers() {
- #if INCLUDE_G1GC
-   if (UseG1GC) {
-     // Verify G1 pre-barriers
-     const int marking_offset = in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset());
- 
-     ResourceArea *area = Thread::current()->resource_area();
-     Unique_Node_List visited(area);
-     Node_List worklist(area);
-     // We're going to walk control flow backwards starting from the Root
-     worklist.push(_root);
-     while (worklist.size() > 0) {
-       Node* x = worklist.pop();
-       if (x == NULL || x == top()) continue;
-       if (visited.member(x)) {
-         continue;
-       } else {
-         visited.push(x);
-       }
- 
-       if (x->is_Region()) {
-         for (uint i = 1; i < x->req(); i++) {
-           worklist.push(x->in(i));
-         }
-       } else {
-         worklist.push(x->in(0));
-         // We are looking for the pattern:
-         //                            /->ThreadLocal
-         // If->Bool->CmpI->LoadB->AddP->ConL(marking_offset)
-         //              \->ConI(0)
-         // We want to verify that the If and the LoadB have the same control
-         // See GraphKit::g1_write_barrier_pre()
-         if (x->is_If()) {
-           IfNode *iff = x->as_If();
-           if (iff->in(1)->is_Bool() && iff->in(1)->in(1)->is_Cmp()) {
-             CmpNode *cmp = iff->in(1)->in(1)->as_Cmp();
-             if (cmp->Opcode() == Op_CmpI && cmp->in(2)->is_Con() && cmp->in(2)->bottom_type()->is_int()->get_con() == 0
-                 && cmp->in(1)->is_Load()) {
-               LoadNode* load = cmp->in(1)->as_Load();
-               if (load->Opcode() == Op_LoadB && load->in(2)->is_AddP() && load->in(2)->in(2)->Opcode() == Op_ThreadLocal
-                   && load->in(2)->in(3)->is_Con()
-                   && load->in(2)->in(3)->bottom_type()->is_intptr_t()->get_con() == marking_offset) {
- 
-                 Node* if_ctrl = iff->in(0);
-                 Node* load_ctrl = load->in(0);
- 
-                 if (if_ctrl != load_ctrl) {
-                   // Skip possible CProj->NeverBranch in infinite loops
-                   if ((if_ctrl->is_Proj() && if_ctrl->Opcode() == Op_CProj)
-                       && (if_ctrl->in(0)->is_MultiBranch() && if_ctrl->in(0)->Opcode() == Op_NeverBranch)) {
-                     if_ctrl = if_ctrl->in(0)->in(0);
-                   }
-                 }
-                 assert(load_ctrl != NULL && if_ctrl == load_ctrl, "controls must match");
-               }
-             }
-           }
-         }
-       }
-     }
-   }
- #endif
- }
- 
  #endif
  
  // The Compile object keeps track of failure reasons separately from the ciEnv.
  // This is required because there is not quite a 1-1 relation between the
  // ciEnv and its compilation task and the Compile object.  Note that one
--- 3832,3841 ----