Fix build warnings/UB in LTOCodeGenerator.cpp

Change the gatherModuleForLinking interface to return void,
and add a default case in setMergedModuleOutputFormat to silence gcc warning.

BUG=cleanup
R=jvoung@chromium.org, mseaborn@chromium.org

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

1 files changed, 3 insertions, 1 deletions

diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index 7b89f81aa4..720924807e 100644
--- a/tools/lto/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
@@ -106,7 +106,7 @@ bool LTOCodeGenerator::addModule(LTOModule* mod, std::string& errMsg) {
 // @LOCALMOD-BEGIN
 /// Add a module that will be merged with the final output module.
 /// The merging does not happen until linkGatheredModulesAndDispose().
-bool LTOCodeGenerator::gatherModuleForLinking(LTOModule* mod) {
+void LTOCodeGenerator::gatherModuleForLinking(LTOModule* mod) {
   _gatheredModules.push_back(mod);
 }
 
@@ -205,6 +205,8 @@ void LTOCodeGenerator::setMergedModuleOutputFormat(lto_output_format format)
   case LTO_OUTPUT_FORMAT_EXEC:
     outputFormat = Module::ExecutableOutputFormat;
     break;
+  default:
+    llvm_unreachable("Unexpected output format");
   }
   Module *mergedModule = _linker.getModule();
   mergedModule->setOutputFormat(outputFormat);