Subzero. Flags refactoring.

src/IceBrowserCompileServer.h

 //===- subzero/src/IceBrowserCompileServer.h - Browser server ---*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Declares the browser-based compile server.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICEBROWSERCOMPILESERVER_H
 #define SUBZERO_SRC_ICEBROWSERCOMPILESERVER_H
 
 #include "IceClFlags.h"
-#include "IceClFlagsExtra.h"
 #include "IceCompileServer.h"
 #include "IceDefs.h"
 #include "IceELFStreamer.h"
 
 #include <atomic>
 #include <thread>
 
 namespace llvm {
 class QueueStreamer;
 class raw_fd_ostream;
 } // end of namespace llvm
 
 namespace Ice {
 
 /// The browser variant of the compile server. Compared to the commandline
 /// version, this version gets compile requests over IPC. Each compile request
 /// will have a slimmed down version of argc, argv while other flags are set to
 /// defaults that make sense in the browser case. The output file is specified
 /// via a posix FD, and input bytes are pushed to the server.
 class BrowserCompileServer : public CompileServer {
   BrowserCompileServer(const BrowserCompileServer &) = delete;
   BrowserCompileServer &operator=(const BrowserCompileServer &) = delete;
   class StringStream;
 
 public:
-  BrowserCompileServer()
-      : Flags(&GlobalContext::Flags), ExtraFlags(&GlobalContext::ExtraFlags),
-        HadError(false) {}
+  BrowserCompileServer() : Flags(&GlobalContext::Flags), HadError(false) {}
 
   ~BrowserCompileServer() final;
 
   void run() final;
 
   ErrorCode &getErrorCode() final;
 
   /// Parse and set up the flags for compile jobs.
   void getParsedFlags(uint32_t NumThreads, int argc, char **argv);
 
@@ skipping 40 matching lines @@
   std::unique_ptr<GlobalContext> Ctx;
   /// A borrowed reference to the current InputStream. The compiler owns the
   /// actual reference so the server must be careful not to access after the
   /// compiler is done.
   llvm::QueueStreamer *InputStream = nullptr;
   std::unique_ptr<Ostream> LogStream;
   std::unique_ptr<llvm::raw_fd_ostream> EmitStream;
   std::unique_ptr<StringStream> ErrorStream;
   std::unique_ptr<ELFStreamer> ELFStream;
   ClFlags *Flags;
-  ClFlagsExtra *ExtraFlags;
   std::thread CompileThread;
   std::atomic<bool> HadError;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEBROWSERCOMPILESERVER_H