Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/c1/c1_LIRAssembler.cpp	Wed Sep 22 23:51:03 2010 -0700
     1.2 +++ b/src/share/vm/c1/c1_LIRAssembler.cpp	Tue Dec 29 19:08:54 2009 +0100
     1.3 @@ -35,7 +35,7 @@
     1.4    append_patching_stub(patch);
     1.5  
     1.6  #ifdef ASSERT
     1.7 -  Bytecodes::Code code = info->scope()->method()->java_code_at_bci(info->bci());
     1.8 +  Bytecodes::Code code = info->scope()->method()->java_code_at_bci(info->stack()->bci());
     1.9    if (patch->id() == PatchingStub::access_field_id) {
    1.10      switch (code) {
    1.11        case Bytecodes::_putstatic:
    1.12 @@ -221,7 +221,7 @@
    1.13  #ifndef PRODUCT
    1.14    if (CommentedAssembly) {
    1.15      stringStream st;
    1.16 -    st.print_cr(" block B%d [%d, %d]", block->block_id(), block->bci(), block->end()->bci());
    1.17 +    st.print_cr(" block B%d [%d, %d]", block->block_id(), block->bci(), block->end()->printable_bci());
    1.18      _masm->block_comment(st.as_string());
    1.19    }
    1.20  #endif
    1.21 @@ -312,7 +312,7 @@
    1.22  static ValueStack* debug_info(Instruction* ins) {
    1.23    StateSplit* ss = ins->as_StateSplit();
    1.24    if (ss != NULL) return ss->state();
    1.25 -  return ins->lock_stack();
    1.26 +  return ins->state_before();
    1.27  }
    1.28  
    1.29  void LIR_Assembler::process_debug_info(LIR_Op* op) {
    1.30 @@ -327,8 +327,7 @@
    1.31    if (vstack == NULL)  return;
    1.32    if (_pending_non_safepoint != NULL) {
    1.33      // Got some old debug info.  Get rid of it.
    1.34 -    if (_pending_non_safepoint->bci() == src->bci() &&
    1.35 -        debug_info(_pending_non_safepoint) == vstack) {
    1.36 +    if (debug_info(_pending_non_safepoint) == vstack) {
    1.37        _pending_non_safepoint_offset = pc_offset;
    1.38        return;
    1.39      }
    1.40 @@ -358,7 +357,7 @@
    1.41      ValueStack* tc = t->caller_state();
    1.42      if (tc == NULL)  return s;
    1.43      t = tc;
    1.44 -    bci_result = s->scope()->caller_bci();
    1.45 +    bci_result = tc->bci();
    1.46      s = s->caller_state();
    1.47    }
    1.48  }
    1.49 @@ -366,7 +365,7 @@
    1.50  void LIR_Assembler::record_non_safepoint_debug_info() {
    1.51    int         pc_offset = _pending_non_safepoint_offset;
    1.52    ValueStack* vstack    = debug_info(_pending_non_safepoint);
    1.53 -  int         bci       = _pending_non_safepoint->bci();
    1.54 +  int         bci       = vstack->bci();
    1.55  
    1.56    DebugInformationRecorder* debug_info = compilation()->debug_info_recorder();
    1.57    assert(debug_info->recording_non_safepoints(), "sanity");
    1.58 @@ -380,7 +379,7 @@
    1.59      if (s == NULL)  break;
    1.60      IRScope* scope = s->scope();
    1.61      //Always pass false for reexecute since these ScopeDescs are never used for deopt
    1.62 -    debug_info->describe_scope(pc_offset, scope->method(), s_bci, false/*reexecute*/);
    1.63 +    debug_info->describe_scope(pc_offset, scope->method(), s->bci(), false/*reexecute*/);
    1.64    }
    1.65  
    1.66    debug_info->end_non_safepoint(pc_offset);