Subzero. Flags refactoring.

src/IceBrowserCompileServer.cpp

 //===- subzero/src/IceBrowserCompileServer.cpp - Browser compile server ---===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 148 matching lines @@
 void BrowserCompileServer::run() {
   gCompileServer = this;
   getIRTInterfaces();
   gIRTFuncs.serve_translate_request(&SubzeroCallbacks);
 }
 
 void BrowserCompileServer::getParsedFlags(uint32_t NumThreads, int argc,
                                           char **argv) {
   ClFlags::parseFlags(argc, argv);
   ClFlags::getParsedClFlags(*Flags);
-  ClFlags::getParsedClFlagsExtra(*ExtraFlags);
   // Set some defaults which aren't specified via the argv string.
   Flags->setNumTranslationThreads(NumThreads);
   Flags->setUseSandboxing(true);
   Flags->setOutFileType(FT_Elf);
   Flags->setTargetArch(getTargetArch());
-  ExtraFlags->setBuildOnRead(true);
-  ExtraFlags->setInputFileFormat(llvm::PNaClFormat);
+  Flags->setBuildOnRead(true);
+  Flags->setInputFileFormat(llvm::PNaClFormat);
 }
 
 bool BrowserCompileServer::pushInputBytes(const void *Data, size_t NumBytes) {
   // If there was an earlier error, do not attempt to push bytes to the
   // QueueStreamer. Otherwise the thread could become blocked.
   if (HadError.load())
     return true;
   return InputStream->PutBytes(
              const_cast<unsigned char *>(
                  reinterpret_cast<const unsigned char *>(Data)),
@@ skipping 26 matching lines @@
   EmitStream = getOutputStream(ObjFD);
   EmitStream->SetBufferSize(1 << 14);
   std::unique_ptr<StringStream> ErrStrm(new StringStream());
   ErrorStream = std::move(ErrStrm);
   ELFStream.reset(new ELFStreamer(*EmitStream.get()));
   Ctx.reset(new GlobalContext(LogStream.get(), EmitStream.get(),
                               &ErrorStream->getStream(), ELFStream.get()));
   CompileThread = std::thread([this]() {
     llvm::install_fatal_error_handler(fatalErrorHandler, this);
     Ctx->initParserThread();
-    this->getCompiler().run(*ExtraFlags, *Ctx.get(),
+    this->getCompiler().run(*Flags, *Ctx.get(),
                             // Retain original reference, but the compiler
                             // (LLVM's MemoryObject) wants to handle deletion.
                             std::unique_ptr<llvm::DataStreamer>(InputStream));
   });
 }
 
 } // end of namespace Ice
 
 #else // !PNACL_BROWSER_TRANSLATOR
 
 #include "llvm/Support/ErrorHandling.h"
 
 namespace Ice {
 
 BrowserCompileServer::~BrowserCompileServer() {}
 
 void BrowserCompileServer::run() {
   llvm::report_fatal_error("no browser hookups");
 }
 
 ErrorCode &BrowserCompileServer::getErrorCode() {
   llvm::report_fatal_error("no browser hookups");
 }
 
 } // end of namespace Ice
 
 #endif // PNACL_BROWSER_TRANSLATOR