diff --git a/llvm/include/llvm/Support/ToolRunner.h b/llvm/include/llvm/Support/ToolRunner.h
index b5313e942ca70156b9b0c7bb0ec6bbe27398c57c..e44cd6574140fe04e0740fddd19381705334e2e3 100644
--- a/llvm/include/llvm/Support/ToolRunner.h
+++ b/llvm/include/llvm/Support/ToolRunner.h
@@ -79,7 +79,8 @@ public:
 /// LLVM bytecode in a variety of ways.  This abstract interface hides this
 /// complexity behind a simple interface.
 ///
-struct AbstractInterpreter {
+class AbstractInterpreter {
+public:
   static CBE *createCBE(const std::string &ProgramPath, std::string &Message,
                         const std::vector<std::string> *Args = 0);
   static LLC *createLLC(const std::string &ProgramPath, std::string &Message,
diff --git a/llvm/tools/bugpoint/CrashDebugger.cpp b/llvm/tools/bugpoint/CrashDebugger.cpp
index 7dd6db4ab5849f5b4e9301f52e2e03672a53b375..a8e5e98f25239840f534d710ab4af58ea8c51eb8 100644
--- a/llvm/tools/bugpoint/CrashDebugger.cpp
+++ b/llvm/tools/bugpoint/CrashDebugger.cpp
@@ -431,7 +431,7 @@ static bool TestForCodeGenCrash(BugDriver &BD, Module *M) {
     BD.compileProgram(M);
     std::cerr << '\n';
     return false;
-  } catch (ToolExecutionError &TEE) {
+  } catch (ToolExecutionError &) {
     std::cerr << "<crash>\n";
     return true;  // Tool is still crashing.
   }