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

     1.1 --- a/src/share/vm/c1/c1_Instruction.hpp	Fri May 25 11:39:13 2012 -0700
     1.2 +++ b/src/share/vm/c1/c1_Instruction.hpp	Wed May 30 12:17:07 2012 -0700
     1.3 @@ -302,8 +302,6 @@
     1.4  
     1.5    void update_exception_state(ValueStack* state);
     1.6  
     1.7 -  bool has_printable_bci() const                 { return NOT_PRODUCT(_printable_bci != -99) PRODUCT_ONLY(false); }
     1.8 -
     1.9   protected:
    1.10    void set_type(ValueType* type) {
    1.11      assert(type != NULL, "type must exist");
    1.12 @@ -392,8 +390,9 @@
    1.13    // accessors
    1.14    int id() const                                 { return _id; }
    1.15  #ifndef PRODUCT
    1.16 +  bool has_printable_bci() const                 { return _printable_bci != -99; }
    1.17    int printable_bci() const                      { assert(has_printable_bci(), "_printable_bci should have been set"); return _printable_bci; }
    1.18 -  void set_printable_bci(int bci)                { NOT_PRODUCT(_printable_bci = bci;) }
    1.19 +  void set_printable_bci(int bci)                { _printable_bci = bci; }
    1.20  #endif
    1.21    int use_count() const                          { return _use_count; }
    1.22    int pin_state() const                          { return _pin_state; }
    1.23 @@ -576,6 +575,7 @@
    1.24    , _block(b)
    1.25    , _index(index)
    1.26    {
    1.27 +    NOT_PRODUCT(set_printable_bci(Value(b)->printable_bci()));
    1.28      if (type->is_illegal()) {
    1.29        make_illegal();
    1.30      }
    1.31 @@ -631,7 +631,9 @@
    1.32      : Instruction(type)
    1.33      , _java_index(index)
    1.34      , _declared_type(declared)
    1.35 -  {}
    1.36 +  {
    1.37 +    NOT_PRODUCT(set_printable_bci(-1));
    1.38 +  }
    1.39  
    1.40    // accessors
    1.41    int java_index() const                         { return _java_index; }