src/share/vm/opto/idealKit.cpp

*** 46,56 ****
    _delay_all_transforms = delay_all_transforms;
    _var_ct = 0;
    _cvstate = NULL;
    // We can go memory state free or else we need the entire memory state
    assert(_initial_memory == NULL || _initial_memory->Opcode() == Op_MergeMem, "memory must be pre-split");
-   assert(!_gvn.is_IterGVN(), "IdealKit can't be used during Optimize phase");
    int init_size = 5;
    _pending_cvstates = new (C->node_arena()) GrowableArray<Node*>(C->node_arena(), init_size, 0, 0);
    DEBUG_ONLY(_state = new (C->node_arena()) GrowableArray<int>(C->node_arena(), init_size, 0, 0));
    if (!has_declarations) {
       declarations_done();
--- 46,55 ----
*** 294,313 ****
  Node* IdealKit::transform(Node* n) {
    if (_delay_all_transforms) {
      return delay_transform(n);
    } else {
      n = gvn().transform(n);
!     C->record_for_igvn(n);
      return n;
    }
  }
  
  //-----------------------------delay_transform-----------------------------------
  Node* IdealKit::delay_transform(Node* n) {
    // Delay transform until IterativeGVN
    gvn().set_type(n, n->bottom_type());
!   C->record_for_igvn(n);
    return n;
  }
  
  //-----------------------------new_cvstate-----------------------------------
  Node* IdealKit::new_cvstate() {
--- 293,312 ----
  Node* IdealKit::transform(Node* n) {
    if (_delay_all_transforms) {
      return delay_transform(n);
    } else {
      n = gvn().transform(n);
!     gvn().record_for_igvn(n);
      return n;
    }
  }
  
  //-----------------------------delay_transform-----------------------------------
  Node* IdealKit::delay_transform(Node* n) {
    // Delay transform until IterativeGVN
    gvn().set_type(n, n->bottom_type());
!   gvn().record_for_igvn(n);
    return n;
  }
  
  //-----------------------------new_cvstate-----------------------------------
  Node* IdealKit::new_cvstate() {