Subzero: Reduce the amount of #ifdef'd code.

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.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines a driver for translating PNaCl bitcode into native code.
@@ skipping 18 matching lines @@
 #include "IceConverter.h"
 #include "IceELFObjectWriter.h"
 #include "PNaClTranslator.h"
 namespace Ice {
 
 namespace {
 
 struct {
   const char *FlagName;
   int FlagValue;
-} ConditionalBuildAttributes[] = {{"dump", ALLOW_DUMP},
-                                  {"disable_ir_gen", ALLOW_DISABLE_IR_GEN},
-                                  {"llvm_cl", ALLOW_LLVM_CL},
-                                  {"llvm_ir", ALLOW_LLVM_IR},
-                                  {"llvm_ir_as_input", ALLOW_LLVM_IR_AS_INPUT},
-                                  {"minimal_build", ALLOW_MINIMAL_BUILD},
-                                  {"browser_mode", PNACL_BROWSER_TRANSLATOR}};
+} ConditionalBuildAttributes[] = {
+    {"dump", BuildDefs::dump()},
+    {"disable_ir_gen", BuildDefs::disableIrGen()},
+    {"llvm_cl", BuildDefs::llvmCl()},
+    {"llvm_ir", BuildDefs::llvmIr()},
+    {"llvm_ir_as_input", BuildDefs::llvmIrAsInput()},
+    {"minimal_build", BuildDefs::minimal()},
+    {"browser_mode", PNACL_BROWSER_TRANSLATOR}};
 
 // Validates values of build attributes. Prints them to Stream if
 // Stream is non-null.
 void validateAndGenerateBuildAttributes(Ostream *Stream) {
   // List the supported targets.
   if (Stream) {
 #define SUBZERO_TARGET(TARGET) *Stream << "target_" #TARGET << "\n";
 #include "llvm/Config/SZTargets.def"
   }
 
@@ skipping 22 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 (!ALLOW_DISABLE_IR_GEN && Ctx.getFlags().getDisableIRGeneration()) {
+  if (!BuildDefs::disableIrGen() && Ctx.getFlags().getDisableIRGeneration()) {
     Ctx.getStrDump() << "Error: Build doesn't allow --no-ir-gen when not "
                      << "ALLOW_DISABLE_IR_GEN!\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 (ALLOW_LLVM_IR_AS_INPUT && IRFilename.length() >= LLSuffix.length() &&
+  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 (ALLOW_LLVM_IR) {
+  } else if (BuildDefs::llvmIr()) {
     if (PNACL_BROWSER_TRANSLATOR) {
       Ctx.getStrDump()
           << "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;
@@ skipping 34 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