src/share/vm/opto/output.cpp

*** 854,864 ****
      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(), is_method_handle_invoke, return_oop, locvals, expvals, monvals);
    } // End jvms loop
  
    // Mark the end of the scope set.
    debug_info()->end_safepoint(safepoint_pc_offset);
  }
--- 854,866 ----
      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.
!     methodHandle null_mh;
!     bool rethrow_exception = false;
!     debug_info()->describe_scope(safepoint_pc_offset, null_mh, scope_method, jvms->bci(), jvms->should_reexecute(), rethrow_exception, is_method_handle_invoke, return_oop, locvals, expvals, monvals);
    } // End jvms loop
  
    // Mark the end of the scope set.
    debug_info()->end_safepoint(safepoint_pc_offset);
  }
*** 937,947 ****
    // Visit scopes from oldest to youngest.
    for (int depth = 1; depth <= max_depth; depth++) {
      JVMState* jvms = youngest_jvms->of_depth(depth);
      ciMethod* method = jvms->has_method() ? jvms->method() : NULL;
      assert(!jvms->should_reexecute() || depth==max_depth, "reexecute allowed only for the youngest");
!     debug_info->describe_scope(pc_offset, method, jvms->bci(), jvms->should_reexecute());
    }
  
    // Mark the end of the scope set.
    debug_info->end_non_safepoint(pc_offset);
  }
--- 939,950 ----
    // Visit scopes from oldest to youngest.
    for (int depth = 1; depth <= max_depth; depth++) {
      JVMState* jvms = youngest_jvms->of_depth(depth);
      ciMethod* method = jvms->has_method() ? jvms->method() : NULL;
      assert(!jvms->should_reexecute() || depth==max_depth, "reexecute allowed only for the youngest");
!     methodHandle null_mh;
!     debug_info->describe_scope(pc_offset, null_mh, method, jvms->bci(), jvms->should_reexecute());
    }
  
    // Mark the end of the scope set.
    debug_info->end_non_safepoint(pc_offset);
  }