cleanup and rename validateAndGenerateBuildAttributes

src/IceCompiler.cpp

 //===- subzero/src/IceCompiler.cpp - Driver for bitcode translation -------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 24 matching lines @@
 #include "llvm/IR/Module.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/StreamingMemoryObject.h"
 #pragma clang diagnostic pop
 
 namespace Ice {
 
 namespace {
 
-struct {
+struct CBA {
   const char *FlagName;
-  int FlagValue;
+  bool FlagValue;
 } ConditionalBuildAttributes[] = {
     {"dump", BuildDefs::dump()},
     {"llvm_cl", BuildDefs::llvmCl()},
     {"llvm_ir", BuildDefs::llvmIr()},
     {"llvm_ir_as_input", BuildDefs::llvmIrAsInput()},
     {"minimal_build", BuildDefs::minimal()},
     {"browser_mode", BuildDefs::browser()}};
 
-// Validates values of build attributes. Prints them to Stream if Stream is
-// non-null.
-void validateAndGenerateBuildAttributes(Ostream *Stream) {
-  // List the supported targets.
-  if (Stream) {
+/// Dumps values of build attributes to Stream if Stream is

[Jim Stichnoth, 2015/12/19 16:12:54]

Reflow comment to 80-col

[rkotlerimgtec, 2015/12/21 02:51:31]

Done.

+/// non-null.
+void dumpBuildAttributes(Ostream *Stream) {
+  if (!Stream)

[Jim Stichnoth, 2015/12/19 16:12:54]

Stream == nullptr

I think the code base is inconsistent about "if (ptr)" versus "if (ptr !=
nullptr)", but pretty consistent about using "if (ptr == nullptr)" and not "if
(!ptr)".

[rkotlerimgtec, 2015/12/21 02:51:30]

Done.

+    return;
+// List the supported targets.
 #define SUBZERO_TARGET(TARGET) *Stream << "target_" #TARGET << "\n";
 #include "llvm/Config/SZTargets.def"
-  }
-
+  const char *Prefix[2] = {"no", "allow"};
   for (size_t i = 0; i < llvm::array_lengthof(ConditionalBuildAttributes);
        ++i) {
-    switch (ConditionalBuildAttributes[i].FlagValue) {
-    case 0:
-      if (Stream)
-        *Stream << "no_" << ConditionalBuildAttributes[i].FlagName << "\n";
-      break;
-    case 1:
-      if (Stream)
-        *Stream << "allow_" << ConditionalBuildAttributes[i].FlagName << "\n";
-      break;
-    default: {
-      std::string Buffer;
-      llvm::raw_string_ostream StrBuf(Buffer);
-      StrBuf << "Flag " << ConditionalBuildAttributes[i].FlagName
-             << " must be defined as 0/1. Found: "
-             << ConditionalBuildAttributes[i].FlagValue;
-      llvm::report_fatal_error(StrBuf.str());
-    }
-    }
+    const CBA &A = ConditionalBuildAttributes[i];

[Jim Stichnoth, 2015/12/19 16:12:54]

I think you can use "const auto &A" here, and thereby avoid the
otherwise-useless naming of that struct.  What do you think?

[rkotlerimgtec, 2015/12/21 02:51:31]

Done.

+    *Stream << Prefix[A.FlagValue] << "_" << A.FlagName << "\n";
   }
 }
 
 } // end of anonymous namespace
 
 void Compiler::run(const Ice::ClFlagsExtra &ExtraFlags, GlobalContext &Ctx,
                    std::unique_ptr<llvm::DataStreamer> &&InputStream) {
-  validateAndGenerateBuildAttributes(
-      ExtraFlags.getGenerateBuildAtts() ? &Ctx.getStrDump() : nullptr);
+  dumpBuildAttributes(ExtraFlags.getGenerateBuildAtts() ? &Ctx.getStrDump()
+                                                        : nullptr);
   if (ExtraFlags.getGenerateBuildAtts())
     return Ctx.getErrorStatus()->assign(EC_None);
 
   // The Minimal build (specifically, when dump()/emit() are not implemented)
   // allows only --filetype=obj. Check here to avoid cryptic error messages
   // downstream.
   if (!BuildDefs::dump() && Ctx.getFlags().getOutFileType() != FT_Elf) {
     // TODO(stichnot): Access the actual command-line argument via
     // llvm::Option.ArgStr and .ValueStr .
     Ctx.getStrError()
@@ skipping 73 matching lines @@
 
   if (Ctx.getFlags().getTimeEachFunction()) {
     constexpr bool DumpCumulative = false;
     Ctx.dumpTimers(GlobalContext::TSK_Funcs, DumpCumulative);
   }
   constexpr bool FinalStats = true;
   Ctx.dumpStats("_FINAL_", FinalStats);
 }
 
 } // end of namespace Ice