Fix locking for printing error messages.

unittest/BitcodeMunge.h

Index: unittest/BitcodeMunge.h
diff --git a/unittest/BitcodeMunge.h b/unittest/BitcodeMunge.h
index 6b639a74c805d042003682afab2136bcd3f08fe1..0b998642dee44d3542c0a7c6a6faba6415a5320f 100644
--- a/unittest/BitcodeMunge.h
+++ b/unittest/BitcodeMunge.h
@@ -17,6 +17,8 @@
 
 #include "llvm/Bitcode/NaCl/NaClBitcodeMunge.h"
 
+#include "IceClFlags.h"
+
 namespace IceTest {
 
 // Class to run tests on Subzero's bitcode parser. Runs a Subzero
@@ -27,7 +29,9 @@ class SubzeroBitcodeMunger : public llvm::NaClBitcodeMunger {
 public:
   SubzeroBitcodeMunger(const uint64_t Records[], size_t RecordSize,
                        uint64_t RecordTerminator)
-      : llvm::NaClBitcodeMunger(Records, RecordSize, RecordTerminator) {}
+      : llvm::NaClBitcodeMunger(Records, RecordSize, RecordTerminator) {
+    resetMungeFlags();
+  }
 
   /// Runs PNaClTranslator to translate bitcode records (with defined
   /// record Munges), and puts output into DumpResults. Returns true
@@ -39,6 +43,15 @@ public:
     uint64_t NoMunges[] = {0};
     return runTest(TestName, NoMunges, 0);
   }
+
+  /// Sets flags back to default assumptions for munging.
+  void resetFlags();
+
+  /// Flags to use to run tests. Use to change default assumptions.
+  Ice::ClFlags Flags;
+
+private:
+  void resetMungeFlags();
 };
 
 } // end of namespace IceTest