Changes from 3.7 merge to files not in upstream

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 940412981a5900167a7ce1d01cfc138de490df4c..8c42af1475d58178e9c60fb91fda331cf72ef791 100644
--- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
+++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
@@ -235,6 +235,7 @@ public:
   bool isDematerializable(const GlobalValue *GV) const override;
   std::error_code materialize(GlobalValue *GV) override;
   std::error_code MaterializeModule(Module *M) override;
+  std::vector<StructType *> getIdentifiedStructTypes() const override;
   void Dematerialize(GlobalValue *GV) override;
   void releaseBuffer();
 
@@ -254,6 +255,14 @@ public:
   /// an error message and returns corresponding error code.
   std::error_code getAlignmentValue(uint64_t Exponent, unsigned &Alignment);
 
+  // GVMaterializer interface. It's a no-op for PNaCl bitcode, which has no
+  // metadata.
+  std::error_code materializeMetadata() override { return std::error_code(); };
+
+  // GVMaterializer interface. Causes debug info to be stripped from the module
+  // on materialization. It's a no-op for PNaCl bitcode, which has no metadata.
+  void setStripDebugInfo() override {};
+
 private:
   // Returns false if Header is acceptable.
   bool AcceptHeader() const {