Update Subzero to start parsing PNaCl bitcode files.

src/IceConverter.h

Index: src/IceConverter.h
diff --git a/src/IceConverter.h b/src/IceConverter.h
index 71fc8aa0c5f4dadc13af0867f5da349ccf5b79aa..c449066789f1060a6e4f9fa2ab19b39b088d5296 100644
--- a/src/IceConverter.h
+++ b/src/IceConverter.h
@@ -14,7 +14,7 @@
 #ifndef SUBZERO_SRC_ICECONVERTER_H
 #define SUBZERO_SRC_ICECONVERTER_H
 
-#include "IceGlobalContext.h"
+#include "IceTranslator.h"
 
 namespace llvm {
 class Module;
@@ -22,27 +22,13 @@ class Module;
 
 namespace Ice {
 
-class Converter {
+class Converter : public Ice::Translator {

[Jim Stichnoth, 2014/07/07 20:50:23]

Is Ice:: necessary when it's already inside namespace Ice?  (here and below)

[Karl, 2014/07/07 21:50:55]

Done.

 public:
-  Converter(Ice::GlobalContext *Ctx,
-            bool DisableInternal,
-            bool SubzeroTimingEnabled,
-            bool DisableTranslation)
-      : Ctx(Ctx),
-        DisableInternal(DisableInternal),
-        SubzeroTimingEnabled(SubzeroTimingEnabled),
-        DisableTranslation(DisableTranslation)
-  {}
+  Converter(GlobalContext *Ctx, Ice::ClFlags &Flags) : Translator(Ctx, Flags) {}
   /// Converts the LLVM Module to ICE. Returns exit status 0 if successful,
   /// Nonzero otherwise.
   int convertToIce(llvm::Module *Mod);
-private:
-  Ice::GlobalContext *Ctx;
-  bool DisableInternal;
-  bool SubzeroTimingEnabled;
-  bool DisableTranslation;
 };

[Jim Stichnoth, 2014/07/07 20:50:23]

Add private methods:

  Converter(const Converter &) LLVM_DELETED_FUNCTION;
  Converter &operator=(const Converter &) LLVM_DELETED_FUNCTION;

[Karl, 2014/07/07 21:50:55]

Done.

-
 }
 
-#endif  // SUBZERO_SRC_ICECONVERTER_H
+#endif // SUBZERO_SRC_ICECONVERTER_H