# HG changeset patch
# User fujie
# Date 1537350249 -28800
# Node ID 43893ee8d3dca680c55861f418229b7834cc6969
# Parent  1ccc5a3b3671bab1872d0dc9ca847ec75d0a8665
#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)

diff -r 1ccc5a3b3671 -r 43893ee8d3dc src/cpu/mips/vm/c1_LIRAssembler_mips.cpp
--- a/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp	Thu Oct 11 09:53:13 2018 +0800
+++ b/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp	Wed Sep 19 17:44:09 2018 +0800
@@ -5974,22 +5974,19 @@
 }
 
 void LIR_Assembler::membar_loadload() {
-  // no-op
-  //   //__ membar(Assembler::Membar_mask_bits(Assembler::loadload));
- }
+  __ sync();
+}
 
 void LIR_Assembler::membar_storestore() {
-  // no-op
-  //   //__ membar(Assembler::Membar_mask_bits(Assembler::storestore));
- }
+  __ sync();
+}
 
 void LIR_Assembler::membar_loadstore() {
-  // no-op
-  //   //__ membar(Assembler::Membar_mask_bits(Assembler::loadstore));
- }
+  __ sync();
+}
 
 void LIR_Assembler::membar_storeload() {
-  //__ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
+  __ sync();
 }