Mercurial > jdk8-mips64-public > hotspot / changeset

• changeset
• raw
• bz2
• zip
• gz

changeset

#7554 [C1] fix a java.lang.NullPointerException for compiler/stringopts/TestStringObjectInitialization.java

Wed, 19 Sep 2018 17:44:09 +0800

author

fujie

date

Wed, 19 Sep 2018 17:44:09 +0800

changeset 9252

43893ee8d3dc

parent 9251

1ccc5a3b3671

child 9253

c30fb4ef0275

#7554 [C1] fix a java.lang.NullPointerException for compiler/stringopts/TestStringObjectInitialization.java

Exception in thread "Thread-37" java.lang.NullPointerException
at java.lang.String.length(String.java:623)
at java.lang.AbstractStringBuilder.append(AbstractStringBuilder.java:447)
at java.lang.StringBuilder.append(StringBuilder.java:136)
at TestStringObjectInitialization.add(TestStringObjectInitialization.java:55)
at TestStringObjectInitialization.run(TestStringObjectInitialization.java:60)
at Runner.run(TestStringObjectInitialization.java:74)
at java.lang.Thread.run(Thread.java:748)

     1.1 --- a/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp	Thu Oct 11 09:53:13 2018 +0800
     1.2 +++ b/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp	Wed Sep 19 17:44:09 2018 +0800
     1.3 @@ -5974,22 +5974,19 @@
     1.4  }
     1.5  
     1.6  void LIR_Assembler::membar_loadload() {
     1.7 -  // no-op
     1.8 -  //   //__ membar(Assembler::Membar_mask_bits(Assembler::loadload));
     1.9 - }
    1.10 +  __ sync();
    1.11 +}
    1.12  
    1.13  void LIR_Assembler::membar_storestore() {
    1.14 -  // no-op
    1.15 -  //   //__ membar(Assembler::Membar_mask_bits(Assembler::storestore));
    1.16 - }
    1.17 +  __ sync();
    1.18 +}
    1.19  
    1.20  void LIR_Assembler::membar_loadstore() {
    1.21 -  // no-op
    1.22 -  //   //__ membar(Assembler::Membar_mask_bits(Assembler::loadstore));
    1.23 - }
    1.24 +  __ sync();
    1.25 +}
    1.26  
    1.27  void LIR_Assembler::membar_storeload() {
    1.28 -  //__ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
    1.29 +  __ sync();
    1.30  }
    1.31  
    1.32