diff --git a/include/llvm/Support/ToolRunner.h b/include/llvm/Support/ToolRunner.h
index b5313e942ca..e44cd657414 100644
--- a/include/llvm/Support/ToolRunner.h
+++ b/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/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp
index 7dd6db4ab58..a8e5e98f252 100644
--- a/tools/bugpoint/CrashDebugger.cpp
+++ b/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.
   }
diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h
index b5313e942ca..e44cd657414 100644
--- a/tools/bugpoint/ToolRunner.h
+++ b/tools/bugpoint/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,