src/share/vm/opto/output.cpp

rev 1024 : imported patch indy-cleanup-6893081.patch

*** 909,921 ****
  
      // Make method available for all Safepoints
      ciMethod* scope_method = method ? method : _method;
      // Describe the scope here
      assert(jvms->bci() >= InvocationEntryBci && jvms->bci() <= 0x10000, "must be a valid or entry BCI");
!     assert(!jvms->should_reexecute() || depth==max_depth, "reexecute allowed only for the youngest");
      // Now we can describe the scope.
!     debug_info()->describe_scope(safepoint_pc_offset,scope_method,jvms->bci(),jvms->should_reexecute(),locvals,expvals,monvals);
    } // End jvms loop
  
    // Mark the end of the scope set.
    debug_info()->end_safepoint(safepoint_pc_offset);
  }
--- 909,922 ----
  
      // Make method available for all Safepoints
      ciMethod* scope_method = method ? method : _method;
      // Describe the scope here
      assert(jvms->bci() >= InvocationEntryBci && jvms->bci() <= 0x10000, "must be a valid or entry BCI");
!     assert(!jvms->should_reexecute() || depth == max_depth, "reexecute allowed only for the youngest");
      // Now we can describe the scope.
!     bool is_method_handle_invoke = false;
!     debug_info()->describe_scope(safepoint_pc_offset, scope_method, jvms->bci(), jvms->should_reexecute(), is_method_handle_invoke, locvals, expvals, monvals);
    } // End jvms loop
  
    // Mark the end of the scope set.
    debug_info()->end_safepoint(safepoint_pc_offset);
  }