Clean up remnants of direct use of PNACL_BROWSER_TRANSLATOR

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
 /// \brief Defines a driver for translating PNaCl bitcode into native code.
 ///
 /// The driver can either directly parse the binary bitcode file, or use LLVM
 /// routines to parse a textual bitcode file into LLVM IR and then convert LLVM
 /// IR into ICE. In either case, the high-level ICE is then compiled down to
 /// native code, as either an ELF object file or a textual asm file.
 ///
 //===----------------------------------------------------------------------===//
 
 #include "IceCompiler.h"
 
+#include "IceBuildDefs.h"
 #include "IceCfg.h"
 #include "IceClFlags.h"
 #include "IceClFlagsExtra.h"
 #include "IceConverter.h"
 #include "IceELFObjectWriter.h"
 #include "PNaClTranslator.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #include "llvm/ADT/STLExtras.h"
@@ skipping 12 matching lines @@
 struct {
   const char *FlagName;
   int FlagValue;
 } 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}};
+    {"browser_mode", BuildDefs::browser()}};
 
 // 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 61 matching lines @@
   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) {
+    if (BuildDefs::browser()) {
       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::DiagnosticHandlerFunction DiagnosticHandler =
         ExtraFlags.getLLVMVerboseErrors()
             ? redirectNaClDiagnosticToStream(llvm::errs())
@@ skipping 36 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