Subzero: Fix -build-atts option.

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 32 matching lines @@
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif // __clang__
 
 #include <regex>
 
 namespace Ice {
 
 namespace {
 
-struct {
-  const char *FlagName;
-  bool FlagValue;
-} ConditionalBuildAttributes[] = {
-    {"dump", BuildDefs::dump()},
-    {"llvm_cl", BuildDefs::llvmCl()},
-    {"llvm_ir", BuildDefs::llvmIr()},
-    {"llvm_ir_as_input", BuildDefs::llvmIrAsInput()},
-    {"minimal_build", BuildDefs::minimal()},
-    {"browser_mode", BuildDefs::browser()}};
-
-/// Dumps values of build attributes to Stream if Stream is non-null.
-void dumpBuildAttributes(Ostream &Str) {
-// List the supported targets.
-#define SUBZERO_TARGET(TARGET) Str << "target_" #TARGET << "\n";
-#include "llvm/Config/SZTargets.def"
-  const char *Prefix[2] = {"no", "allow"};
-  for (size_t i = 0; i < llvm::array_lengthof(ConditionalBuildAttributes);
-       ++i) {
-    const auto &A = ConditionalBuildAttributes[i];
-    Str << Prefix[A.FlagValue] << "_" << A.FlagName << "\n";
-  }
-}
 bool llvmIRInput(const IceString &Filename) {
   return BuildDefs::llvmIrAsInput() &&
          std::regex_match(Filename, std::regex(".*\\.ll"));
 }
 
 } // end of anonymous namespace
 
 void Compiler::run(const Ice::ClFlagsExtra &ExtraFlags, GlobalContext &Ctx,
                    std::unique_ptr<llvm::DataStreamer> &&InputStream) {
-  if (ExtraFlags.getGenerateBuildAtts()) {
-    dumpBuildAttributes(Ctx.getStrDump());
-    Ctx.getErrorStatus()->assign(EC_None);
-    return;
-  }
   // 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";
     Ctx.getErrorStatus()->assign(EC_Args);
     return;
   }
 
   TimerMarker T(Ice::TimerStack::TT_szmain, &Ctx);
 
   Ctx.emitFileHeader();
   Ctx.startWorkerThreads();
 
   std::unique_ptr<Translator> Translator;
   const IceString &IRFilename = ExtraFlags.getIRFilename();
-  bool BuildOnRead = ExtraFlags.getBuildOnRead() && !llvmIRInput(IRFilename);
+  const bool BuildOnRead =
+      ExtraFlags.getBuildOnRead() && !llvmIRInput(IRFilename);
   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 (BuildDefs::browser()) {
       Ctx.getStrError()
           << "non BuildOnRead is not supported w/ PNACL_BROWSER_TRANSLATOR\n";
@@ skipping 47 matching lines @@
 
   if (Ctx.getFlags().getTimeEachFunction()) {
     constexpr bool DumpCumulative = false;
     Ctx.dumpTimers(GlobalContext::TSK_Funcs, DumpCumulative);
   }
   constexpr bool FinalStats = true;
   Ctx.dumpStats("_FINAL_", FinalStats);
 }
 
 } // end of namespace Ice