Simplify references to command line flags.

src/IceCompileServer.cpp

 //===- subzero/src/IceCompileServer.cpp - 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 78 matching lines @@
                                     std::error_code &EC) {
   if (Filename == "-") {
     return std::unique_ptr<Ostream>(new llvm::raw_os_ostream(std::cout));
   } else {
     return std::unique_ptr<Ostream>(
         new llvm::raw_fd_ostream(Filename, EC, llvm::sys::fs::F_None));
   }
 }
 
 ErrorCodes getReturnValue(ErrorCodes Val) {
-  if (GlobalContext::Flags.getAlwaysExitSuccess())
+  if (getFlags().getAlwaysExitSuccess())
     return EC_None;
   return Val;
 }
 
 // Reports fatal error message, and then exits with success status 0.
 void reportFatalErrorThenExitSuccess(void *UserData, const std::string &Reason,
                                      bool GenCrashDag) {
   (void)UserData;
   (void)GenCrashDag;
 
@@ skipping 42 matching lines @@
   }
 }
 
 } // end of anonymous namespace
 
 void CLCompileServer::run() {
   if (BuildDefs::dump()) {
     llvm::sys::PrintStackTraceOnErrorSignal();
   }
   ClFlags::parseFlags(argc, argv);
-  ClFlags &Flags = GlobalContext::Flags;
+  ClFlags &Flags = ClFlags::Flags;
   ClFlags::getParsedClFlags(Flags);
 
   // Override report_fatal_error if we want to exit with 0 status.
   if (Flags.getAlwaysExitSuccess())
     llvm::install_fatal_error_handler(reportFatalErrorThenExitSuccess, this);
 
   std::error_code EC;
   std::unique_ptr<Ostream> Ls = makeStream(Flags.getLogFilename(), EC);
   if (EC) {
     llvm::report_fatal_error("Unable to open log file");
@@ skipping 49 matching lines @@
     Err.print(Flags.getAppName().c_str(), *Ls);
     return transferErrorCode(getReturnValue(Ice::EC_Bitcode));
   }
 
   if (Flags.getGenerateBuildAtts()) {
     dumpBuildAttributes(*Os.get());
     return transferErrorCode(getReturnValue(Ice::EC_None));
   }
 
   Ctx.reset(new GlobalContext(Ls.get(), Os.get(), Ls.get(), ELFStr.get()));
-  if (Ctx->getFlags().getNumTranslationThreads() != 0) {
+  if (getFlags().getNumTranslationThreads() != 0) {
     std::thread CompileThread([this, &Flags, &InputStream]() {
       Ctx->initParserThread();
       getCompiler().run(Flags, *Ctx.get(), std::move(InputStream));
     });
     CompileThread.join();
   } else {
     getCompiler().run(Flags, *Ctx.get(), std::move(InputStream));
   }
   transferErrorCode(
       getReturnValue(static_cast<ErrorCodes>(Ctx->getErrorStatus()->value())));
   Ctx->dumpConstantLookupCounts();
   Ctx->dumpStrings();
 }
 
 } // end of namespace Ice