Clean up Cl flag refrences in the bitcode parser.

src/PNaClTranslator.cpp

 //===- subzero/src/PNaClTranslator.cpp - ICE from bitcode -----------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 219 matching lines @@
   TopLevelParser(Ice::Translator &Translator, NaClBitstreamCursor &Cursor,
                  Ice::ErrorCode &ErrorStatus)
       : NaClBitcodeParser(Cursor), Translator(Translator),
         ErrorStatus(ErrorStatus),
         VariableDeclarations(new Ice::VariableDeclarationList()) {}
 
   ~TopLevelParser() override = default;
 
   Ice::Translator &getTranslator() const { return Translator; }
 
+  const Ice::ClFlags &getFlags() const {

[Jim Stichnoth, 2016/03/31 21:02:31]

Make this static?

[Karl, 2016/03/31 21:39:48]

Done.

+    return Ice::GlobalContext::getFlags();
+  }
+
   /// Generates error with given Message, occurring at BitPosition within the
   /// bitcode file. Always returns true.
   bool ErrorAt(naclbitc::ErrorLevel Level, uint64_t BitPosition,
                const std::string &Message) override;
 
   /// Generates error message with respect to the current block parser.
   bool blockError(const std::string &Message);
 
   /// Changes the size of the type list to the given size.
   void resizeTypeIDValues(size_t NewSize) { TypeIDValues.resize(NewSize); }
@@ skipping 232 matching lines @@
       } else {
         Decl->setName(Ctx);
       }
       ++NameIndex;
     }
   }
 
   // Installs names for global variables without names.
   void installGlobalVarNames() {
     assert(VariableDeclarations);
-    const std::string &GlobalPrefix =
-        getTranslator().getFlags().getDefaultGlobalPrefix();
+    const std::string &GlobalPrefix = getFlags().getDefaultGlobalPrefix();
     if (!GlobalPrefix.empty()) {
       NaClBcIndexSize_t NameIndex = 0;
       for (Ice::VariableDeclaration *Var : *VariableDeclarations) {
         installDeclarationName(Var, GlobalPrefix, "global", NameIndex);
       }
     }
   }
 
   // Installs names for functions without names.
   void installFunctionNames() {
-    const std::string &FunctionPrefix =
-        getTranslator().getFlags().getDefaultFunctionPrefix();
+    const std::string &FunctionPrefix = getFlags().getDefaultFunctionPrefix();
     if (!FunctionPrefix.empty()) {
       NaClBcIndexSize_t NameIndex = 0;
       for (Ice::FunctionDeclaration *Func : FunctionDeclarations) {
         installDeclarationName(Func, FunctionPrefix, "function", NameIndex);
       }
     }
   }
 
   // Builds a constant symbol named Name.  IsExternal is true iff the symbol is
   // external.
@@ skipping 65 matching lines @@
   {
     std::unique_lock<Ice::GlobalLockType> _(ErrorReportingLock);
     ErrorStatus.assign(Ice::EC_Bitcode);
   }
   { // Lock while printing out error message.
     Ice::OstreamLocker L(Context);
     raw_ostream &OldErrStream = setErrStream(Context->getStrError());
     NaClBitcodeParser::ErrorAt(Level, Bit, Message);
     setErrStream(OldErrStream);
   }
-  if (Level >= naclbitc::Error &&
-      !Translator.getFlags().getAllowErrorRecovery())
+  if (Level >= naclbitc::Error && !getFlags().getAllowErrorRecovery())
     Fatal();
   return true;
 }
 
 void TopLevelParser::reportBadTypeIDAs(NaClBcIndexSize_t ID,
                                        const ExtendedType *Ty,
                                        ExtendedType::TypeKind WantedType) {
   std::string Buffer;
   raw_string_ostream StrBuf(Buffer);
   if (Ty == nullptr) {
@@ skipping 83 matching lines @@
   bool BlockHasError = false;
 
   // Constructor for nested block parsers.
   BlockParserBaseClass(unsigned BlockID, BlockParserBaseClass *EnclosingParser)
       : NaClBitcodeParser(BlockID, EnclosingParser),
         Context(EnclosingParser->Context) {}
 
   // Gets the translator associated with the bitcode parser.
   Ice::Translator &getTranslator() const { return Context->getTranslator(); }
 
-  const Ice::ClFlags &getFlags() const { return getTranslator().getFlags(); }
+  const Ice::ClFlags &getFlags() const {
+    return Ice::GlobalContext::getFlags();
+  }
 
   // Default implementation. Reports that block is unknown and skips its
   // contents.
   bool ParseBlock(unsigned BlockID) override;
 
   // Default implementation. Reports that the record is not understood.
   void ProcessRecord() override;
 
   // Checks if the size of the record is Size. Return true if valid. Otherwise
   // generates an error and returns false.
@@ skipping 2462 matching lines @@
       }
       Ctx->optQueueBlockingPush(Ice::makeUnique<CfgParserWorkItem>(
           BlockID, FcnId, this, std::move(Buffer), BufferSize, StartBit,
           SeqNumber));
       return false;
     } else {
       FunctionParser Parser(BlockID, this, FcnId);
       std::unique_ptr<Ice::Cfg> Func = Parser.parseFunction(SeqNumber);
       bool Failed = Func->hasError();
       getTranslator().translateFcn(std::move(Func));
-      return Failed && !getTranslator().getFlags().getAllowErrorRecovery();
+      return Failed && !getFlags().getAllowErrorRecovery();
     }
   }
   default:
     return BlockParserBaseClass::ParseBlock(BlockID);
   }
 }
 
 void ModuleParser::ProcessRecord() {
   const NaClBitcodeRecord::RecordVector &Values = Record.GetValues();
   switch (Record.GetCode()) {
@@ skipping 108 matching lines @@
     raw_string_ostream StrBuf(Buffer);
     StrBuf << IRFilename << ": Does not contain a module!";
     llvm::report_fatal_error(StrBuf.str());
   }
   if (InputStreamFile.getBitcodeBytes().getExtent() % 4 != 0) {
     llvm::report_fatal_error("Bitcode stream should be a multiple of 4 bytes");
   }
 }
 
 } // end of namespace Ice