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

lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h

 //===- NaClBitcodeReader.h ------------------------------------*- C++ -*-===//
 //     Internal NaClBitcodeReader implementation
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ skipping 147 matching lines @@
   // When reading the module header, this list is populated with functions that
   // have bodies later in the file.
   std::vector<Function*> FunctionsWithBodies;
 
   // When intrinsic functions are encountered which require upgrading they are
   // stored here with their replacement function.
   typedef std::vector<std::pair<Function*, Function*> > UpgradedIntrinsicMap;
   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;
 
   /// DeferredFunctionInfo - When function bodies are initially scanned, this
   /// map contains info about where to find deferred function body in the
   /// stream.
   DenseMap<Function*, uint64_t> DeferredFunctionInfo;
 
   /// \brief True if we should only accept supported bitcode format.
   bool AcceptSupportedBitcodeOnly;
@@ skipping 46 matching lines @@
         SeenFirstFunctionBody(false),
         AcceptSupportedBitcodeOnly(AcceptSupportedOnly),
         IntPtrType(IntegerType::get(C, PNaClIntPtrTypeBitSize)) {
   }
   ~NaClBitcodeReader() override {
     FreeState();
   }
 
   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());
   }
 
   /// Generates the corresponding verbose Message, then generates error.
   std::error_code Error(ErrorType E, const std::string &Message) const;
 
   /// @brief Main interface to parsing a bitcode buffer.
   /// @returns true if an error occurred.
@@ skipping 100 matching lines @@
   std::error_code InitStreamFromBuffer();
   std::error_code InitLazyStream();
   std::error_code FindFunctionInStream(
       Function *F,
       DenseMap<Function*, uint64_t>::iterator DeferredFunctionInfoIterator);
 };
 
 } // End llvm namespace
 
 #endif