hotspot/src/share/vm/ci/ciMethod.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)ciMethod.cpp 1.109 07/09/28 10:23:23 JVM"
  #endif
  /*
!  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)ciMethod.cpp 1.109 07/09/28 10:23:23 JVM"
  #endif
  /*
!  * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 147,157 ****
    // Load the bytecodes.
    _code = (address)arena->Amalloc(code_size());
    memcpy(_code, me->code_base(), code_size());
  
    // Revert any breakpoint bytecodes in ci's copy
!   if (_is_compilable && me->number_of_breakpoints() > 0) {
      BreakpointInfo* bp = instanceKlass::cast(me->method_holder())->breakpoints();
      for (; bp != NULL; bp = bp->next()) {
        if (bp->match(me)) {
          code_at_put(bp->bci(), bp->orig_bytecode());
        }
--- 147,157 ----
    // Load the bytecodes.
    _code = (address)arena->Amalloc(code_size());
    memcpy(_code, me->code_base(), code_size());
  
    // Revert any breakpoint bytecodes in ci's copy
!   if (me->number_of_breakpoints() > 0) {
      BreakpointInfo* bp = instanceKlass::cast(me->method_holder())->breakpoints();
      for (; bp != NULL; bp = bp->next()) {
        if (bp->match(me)) {
          code_at_put(bp->bci(), bp->orig_bytecode());
        }
*** 879,889 ****
      // that currently isn't properly recorded.
      if (code == NULL ||
          (TieredCompilation && code->compiler() != NULL && code->compiler()->is_c1())) {
        return 0;
      }
!     return code->code_size();
    )
  }
  
  // ------------------------------------------------------------------
  // ciMethod::log_nmethod_identity
--- 879,889 ----
      // that currently isn't properly recorded.
      if (code == NULL ||
          (TieredCompilation && code->compiler() != NULL && code->compiler()->is_c1())) {
        return 0;
      }
!     return code->code_end() - code->verified_entry_point();
    )
  }
  
  // ------------------------------------------------------------------
  // ciMethod::log_nmethod_identity