PNaCl localmod mods in LLVM to 223109 (local files only)

lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h

Index: lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
index 4088a7ebe7bc4afc0ae15b4a3b4249751505e0e8..940412981a5900167a7ce1d01cfc138de490df4c 100644
--- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
+++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
@@ -165,7 +165,7 @@ class NaClBitcodeReader : public GVMaterializer {
   UpgradedIntrinsicMap UpgradedIntrinsics;
 
   // Several operations happen after the module header has been read, but
-  // before function bodies are processed.  This keeps track of whether
+  // before function bodies are processed. This keeps track of whether
   // we've done this yet.
   bool SeenFirstFunctionBody;
 
@@ -232,12 +232,11 @@ public:
 
   void FreeState();
 
-  bool isMaterializable(const GlobalValue *GV) const override;
   bool isDematerializable(const GlobalValue *GV) const override;
-  std::error_code Materialize(GlobalValue *GV) override;
+  std::error_code materialize(GlobalValue *GV) override;
   std::error_code MaterializeModule(Module *M) override;
   void Dematerialize(GlobalValue *GV) override;
-  void releaseBuffer() override;
+  void releaseBuffer();

[JF, 2015/02/24 05:35:37]

Not virtual anymore?

[jvoung (off chromium), 2015/02/24 18:38:48]

Yes, not virtual anymore. There's fancy new clang warning to catch
inconsistent/missing overrides =)

 
   std::error_code Error(ErrorType E) const {
     return std::error_code(E, BitcodeErrorCategory());