Subzero: Misc fixes/cleanup.

src/IceCompiler.cpp

 //===- subzero/src/IceCompiler.cpp - Driver for bitcode translation -------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 75 matching lines @@
 } // end of anonymous namespace
 
 void Compiler::run(const Ice::ClFlagsExtra &ExtraFlags, GlobalContext &Ctx,
                    std::unique_ptr<llvm::DataStreamer> &&InputStream) {
   validateAndGenerateBuildAttributes(
       ExtraFlags.getGenerateBuildAtts() ? &Ctx.getStrDump() : nullptr);
   if (ExtraFlags.getGenerateBuildAtts())
     return Ctx.getErrorStatus()->assign(EC_None);
 
   if (!BuildDefs::disableIrGen() && Ctx.getFlags().getDisableIRGeneration()) {
-    Ctx.getStrDump() << "Error: Build doesn't allow --no-ir-gen when not "
-                     << "ALLOW_DISABLE_IR_GEN!\n";
+    Ctx.getStrError() << "Error: Build doesn't allow --no-ir-gen when not "
+                      << "ALLOW_DISABLE_IR_GEN!\n";
     return Ctx.getErrorStatus()->assign(EC_Args);
   }
 
+  // The Minimal build (specifically, when dump()/emit() are not implemented)
+  // allows only --filetype=obj.  Check here to avoid cryptic error messages
+  // downstream.
+  if (!BuildDefs::dump() && Ctx.getFlags().getOutFileType() != FT_Elf) {
+    // TODO(stichnot): Access the actual command-line argument via
+    // llvm::Option.ArgStr and .ValueStr .
+    Ctx.getStrError()
+        << "Error: only --filetype=obj is supported in this build.\n";
+    return Ctx.getErrorStatus()->assign(EC_Args);
+  }
+
   // Force -build-on-read=0 for .ll files.
   const std::string LLSuffix = ".ll";
   const IceString &IRFilename = ExtraFlags.getIRFilename();
   bool BuildOnRead = ExtraFlags.getBuildOnRead();
   if (BuildDefs::llvmIrAsInput() && IRFilename.length() >= LLSuffix.length() &&
       IRFilename.compare(IRFilename.length() - LLSuffix.length(),
                          LLSuffix.length(), LLSuffix) == 0)
     BuildOnRead = false;
 
   TimerMarker T(Ice::TimerStack::TT_szmain, &Ctx);
 
   Ctx.emitFileHeader();
   Ctx.startWorkerThreads();
 
   std::unique_ptr<Translator> Translator;
   if (BuildOnRead) {
     std::unique_ptr<PNaClTranslator> PTranslator(new PNaClTranslator(&Ctx));
     std::unique_ptr<llvm::StreamingMemoryObject> MemObj(
         new llvm::StreamingMemoryObjectImpl(InputStream.release()));
     PTranslator->translate(IRFilename, std::move(MemObj));
     Translator.reset(PTranslator.release());
   } else if (BuildDefs::llvmIr()) {
     if (PNACL_BROWSER_TRANSLATOR) {
-      Ctx.getStrDump()
+      Ctx.getStrError()
           << "non BuildOnRead is not supported w/ PNACL_BROWSER_TRANSLATOR\n";
       return Ctx.getErrorStatus()->assign(EC_Args);
     }
     // Parse the input LLVM IR file into a module.
     llvm::SMDiagnostic Err;
     TimerMarker T1(Ice::TimerStack::TT_parse, &Ctx);
     llvm::raw_ostream *Verbose =
         ExtraFlags.getLLVMVerboseErrors() ? &llvm::errs() : nullptr;
     std::unique_ptr<llvm::Module> Mod =
         NaClParseIRFile(IRFilename, ExtraFlags.getInputFileFormat(), Err,
                         Verbose, llvm::getGlobalContext());
     if (!Mod) {
       Err.print(ExtraFlags.getAppName().c_str(), llvm::errs());
       return Ctx.getErrorStatus()->assign(EC_Bitcode);
     }
 
     std::unique_ptr<Converter> Converter(new class Converter(Mod.get(), &Ctx));
     Converter->convertToIce();
     Translator.reset(Converter.release());
   } else {
-    Ctx.getStrDump() << "Error: Build doesn't allow LLVM IR, "
-                     << "--build-on-read=0 not allowed\n";
+    Ctx.getStrError() << "Error: Build doesn't allow LLVM IR, "
+                      << "--build-on-read=0 not allowed\n";
     return Ctx.getErrorStatus()->assign(EC_Args);
   }
 
   Ctx.waitForWorkerThreads();
   if (Translator->getErrorStatus()) {
     Ctx.getErrorStatus()->assign(Translator->getErrorStatus().value());
   } else {
     Ctx.lowerGlobals("last");
     Ctx.lowerProfileData();
     Ctx.lowerConstants();
@@ skipping 11 matching lines @@
 
   if (Ctx.getFlags().getTimeEachFunction()) {
     const bool DumpCumulative = false;
     Ctx.dumpTimers(GlobalContext::TSK_Funcs, DumpCumulative);
   }
   constexpr bool FinalStats = true;
   Ctx.dumpStats("_FINAL_", FinalStats);
 }
 
 } // end of namespace Ice