Index: src/IceCompiler.cpp |
diff --git a/src/IceCompiler.cpp b/src/IceCompiler.cpp |
index 08e1a147d60222ff8581d4972cc01748569f034d..d605610bba4d52bbb84e4f3b6e7325d3aee900af 100644 |
--- a/src/IceCompiler.cpp |
+++ b/src/IceCompiler.cpp |
@@ -87,9 +87,11 @@ void Compiler::run(const Ice::ClFlags &Flags, GlobalContext &Ctx, |
if (BuildOnRead) { |
std::unique_ptr<PNaClTranslator> PTranslator(new PNaClTranslator(&Ctx)); |
#ifdef PNACL_LLVM |
- std::unique_ptr<llvm::StreamingMemoryObject> MemObj(new llvm::StreamingMemoryObjectImpl(InputStream.release())); |
-#else // !PNACL_LLVM |
- std::unique_ptr<llvm::StreamingMemoryObject> MemObj(new llvm::StreamingMemoryObject(std::move(InputStream))); |
+ std::unique_ptr<llvm::StreamingMemoryObject> MemObj( |
+ new llvm::StreamingMemoryObjectImpl(InputStream.release())); |
+#else // !PNACL_LLVM |
+ std::unique_ptr<llvm::StreamingMemoryObject> MemObj( |
+ new llvm::StreamingMemoryObject(std::move(InputStream))); |
#endif // !PNACL_LLVM |
PTranslator->translate(IRFilename, std::move(MemObj)); |
Translator.reset(PTranslator.release()); |
@@ -131,11 +133,10 @@ void Compiler::run(const Ice::ClFlags &Flags, GlobalContext &Ctx, |
std::unique_ptr<llvm::Module> Mod = |
NaClParseIRFile(IRFilename, Flags.getInputFileFormat(), Err, |
llvm::getGlobalContext(), DiagnosticHandler); |
-#else // !PNACL_LLVM |
+#else // !PNACL_LLVM |
llvm::DiagnosticHandlerFunction DiagnosticHandler = nullptr; |
llvm::LLVMContext Context; |
- std::unique_ptr<llvm::Module> Mod = |
- parseIRFile(IRFilename, Err, Context); |
+ std::unique_ptr<llvm::Module> Mod = parseIRFile(IRFilename, Err, Context); |
#endif // !PNACL_LLVM |
if (!Mod) { |
Err.print(Flags.getAppName().c_str(), llvm::errs()); |