Print this page
rev 1024 : imported patch indy-cleanup-6893081.patch

Split Close
Expand all
Collapse all
          --- old/src/share/vm/opto/output.cpp
          +++ new/src/share/vm/opto/output.cpp
↓ open down ↓ 903 lines elided ↑ open up ↑
 904  904  
 905  905      // Build first class objects to pass to scope
 906  906      DebugToken *locvals = debug_info()->create_scope_values(locarray);
 907  907      DebugToken *expvals = debug_info()->create_scope_values(exparray);
 908  908      DebugToken *monvals = debug_info()->create_monitor_values(monarray);
 909  909  
 910  910      // Make method available for all Safepoints
 911  911      ciMethod* scope_method = method ? method : _method;
 912  912      // Describe the scope here
 913  913      assert(jvms->bci() >= InvocationEntryBci && jvms->bci() <= 0x10000, "must be a valid or entry BCI");
 914      -    assert(!jvms->should_reexecute() || depth==max_depth, "reexecute allowed only for the youngest");
      914 +    assert(!jvms->should_reexecute() || depth == max_depth, "reexecute allowed only for the youngest");
 915  915      // Now we can describe the scope.
 916      -    debug_info()->describe_scope(safepoint_pc_offset,scope_method,jvms->bci(),jvms->should_reexecute(),locvals,expvals,monvals);
      916 +    bool is_method_handle_invoke = false;
      917 +    debug_info()->describe_scope(safepoint_pc_offset, scope_method, jvms->bci(), jvms->should_reexecute(), is_method_handle_invoke, locvals, expvals, monvals);
 917  918    } // End jvms loop
 918  919  
 919  920    // Mark the end of the scope set.
 920  921    debug_info()->end_safepoint(safepoint_pc_offset);
 921  922  }
 922  923  
 923  924  
 924  925  
 925  926  // A simplified version of Process_OopMap_Node, to handle non-safepoints.
 926  927  class NonSafepointEmitter {
↓ open down ↓ 1841 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX