Subzero. Flags refactoring.

src/IceBrowserCompileServer.cpp

Index: src/IceBrowserCompileServer.cpp
diff --git a/src/IceBrowserCompileServer.cpp b/src/IceBrowserCompileServer.cpp
index 284a0c937523e34d99b9c38956f7714e2e4a2b42..5064d3021d5b10cfcb0c24b69681d6c9bbbdf045 100644
--- a/src/IceBrowserCompileServer.cpp
+++ b/src/IceBrowserCompileServer.cpp
@@ -166,14 +166,13 @@ 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) {
@@ -220,7 +219,7 @@ void BrowserCompileServer::startCompileThread(int ObjFD) {
   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));