commit 17b1a133a805ea9384d4a5ae5e0b449162b794f7
author Karl Schimpf <kschimpf@google.com> Thu Mar 12 09:32:06 2015 -0700
committer Karl Schimpf <kschimpf@google.com> Thu Mar 12 09:32:06 2015 -0700
tree f1886a8966773c77dec6c04fe74a7ccd7b744208
parent cd912149a6ea02cc0e5d51884f220c1f9f4870c5

Apply LLVM clean ups for errors when bitcode parsing.

Fixes error reporting to match that
of CL https://codereview.chromium.org/986453002

BUG=None
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/980393004

src/PNaClTranslator.cpp

diff --git a/src/PNaClTranslator.cpp b/src/PNaClTranslator.cpp
index 2ff57c1..f02d0cb 100644
--- a/src/PNaClTranslator.cpp
+++ b/src/PNaClTranslator.cpp
@@ -179,7 +179,8 @@
 
   /// Generates error with given Message, occurring at BitPosition
   /// within the bitcode file. Always returns true.
-  bool ErrorAt(uint64_t BitPosition, const std::string &Message) final;
+  bool ErrorAt(naclbitc::ErrorLevel Level, uint64_t BitPosition,
+               const std::string &Message) final;
 
   /// Generates error message with respect to the current block parser.
   bool BlockError(const std::string &Message);
@@ -500,15 +501,17 @@
   Ice::Type convertToIceTypeError(Type *LLVMTy);
 };
 
-bool TopLevelParser::ErrorAt(uint64_t Bit, const std::string &Message) {
+bool TopLevelParser::ErrorAt(naclbitc::ErrorLevel Level, uint64_t Bit,
+                             const std::string &Message) {
   ErrorStatus.assign(Ice::EC_Bitcode);
   ++NumErrors;
   Ice::GlobalContext *Context = Translator.getContext();
   Ice::OstreamLocker L(Context);
   raw_ostream &OldErrStream = setErrStream(Context->getStrDump());
-  NaClBitcodeParser::ErrorAt(Bit, Message);
+  NaClBitcodeParser::ErrorAt(Level, Bit, Message);
   setErrStream(OldErrStream);
-  if (!Translator.getFlags().getAllowErrorRecovery())
+  if (Level >= naclbitc::Error
+      && !Translator.getFlags().getAllowErrorRecovery())
     Fatal();
   return true;
 }
@@ -586,7 +589,8 @@
   }
 
   // Generates an error Message with the Bit address prefixed to it.
-  bool ErrorAt(uint64_t Bit, const std::string &Message) final;
+  bool ErrorAt(naclbitc::ErrorLevel Level, uint64_t Bit,
+               const std::string &Message) final;
 
 protected:
   // The context parser that contains the decoded state.
@@ -673,7 +677,8 @@
 }
 
 // Generates an error Message with the bit address prefixed to it.
-bool BlockParserBaseClass::ErrorAt(uint64_t Bit, const std::string &Message) {
+bool BlockParserBaseClass::ErrorAt(
+    naclbitc::ErrorLevel Level, uint64_t Bit, const std::string &Message) {
   std::string Buffer;
   raw_string_ostream StrBuf(Buffer);
   // Note: If dump routines have been turned off, the error messages
@@ -688,7 +693,7 @@
   } else {
     StrBuf << Message;
   }
-  return Context->ErrorAt(Bit, StrBuf.str());
+  return Context->ErrorAt(Level, Bit, StrBuf.str());
 }
 
 void BlockParserBaseClass::ReportRecordSizeError(unsigned ExpectedSize,