commit b6c96af1e5f019374ab93b2b66fbf79247d24660
author Karl Schimpf <kschimpf@google.com> Mon Nov 17 10:58:39 2014 -0800
committer Karl Schimpf <kschimpf@google.com> Mon Nov 17 10:58:39 2014 -0800
tree 52190a11824e4c78d1b03cce7cad595c1715bd3a
parent 70d0a054b3a2ed6ee49b2bf5d94cf52d79bbb1b9

Turn off dump/emit routines when building minimal subzero.

Remove the dump/emit routines when ALLOW_DUMP=0. Also fixes some
verbosity messages to not print if ALLOW_DUMP=0. Note: emit routines
needed for emitIAS are not turned off.

BUG=None
R=stichnot@chromium.org

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

src/PNaClTranslator.cpp

diff --git a/src/PNaClTranslator.cpp b/src/PNaClTranslator.cpp
index 07fd5af..0f4feac 100644
--- a/src/PNaClTranslator.cpp
+++ b/src/PNaClTranslator.cpp
@@ -87,11 +87,15 @@
 };
 
 Ice::Ostream &operator<<(Ice::Ostream &Stream, const ExtendedType &Ty) {
+  if (!ALLOW_DUMP)
+    return Stream;
   Ty.dump(Stream);
   return Stream;
 }
 
 Ice::Ostream &operator<<(Ice::Ostream &Stream, ExtendedType::TypeKind Kind) {
+  if (!ALLOW_DUMP)
+    return Stream;
   Stream << "ExtendedType::";
   switch (Kind) {
   case ExtendedType::Undefined:
@@ -138,6 +142,8 @@
 };
 
 void ExtendedType::dump(Ice::Ostream &Stream) const {
+  if (!ALLOW_DUMP)
+    return;
   Stream << Kind;
   switch (Kind) {
   case Simple: {
@@ -545,7 +551,13 @@
     std::string Buffer;
     raw_string_ostream StrBuf(Buffer);
     StrBuf << "(" << format("%" PRIu64 ":%u", (Bit / 8),
-                            static_cast<unsigned>(Bit % 8)) << ") " << Message;
+                            static_cast<unsigned>(Bit % 8)) << ") ";
+    // Note: If dump routines have been turned off, the error messages
+    // will not be readable. Hence, replace with simple error.
+    if (ALLOW_DUMP)
+      StrBuf << Message;
+    else
+      StrBuf << "Invalid input record";
     return Context->Error(StrBuf.str());
   }
 
@@ -1394,6 +1406,8 @@
 
   void dumpVectorIndexCheckValue(raw_ostream &Stream,
                                  VectorIndexCheckValue Value) const {
+    if (!ALLOW_DUMP)
+      return;
     switch (Value) {
     default:
       report_fatal_error("Unknown VectorIndexCheckValue");