1 files changed, 7 insertions, 6 deletions
diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h
index 88a3db4e..c8211854 100644
--- a/lib/Core/Executor.h
+++ b/lib/Core/Executor.h
@@ -38,6 +38,7 @@ namespace llvm {
   class GlobalValue;
   class Instruction;
   class TargetData;
+  class Twine;
   class Value;
 }
 
@@ -333,21 +334,21 @@ private:
   // remove state from queue and delete
   void terminateState(ExecutionState &state);
   // call exit handler and terminate state
-  void terminateStateEarly(ExecutionState &state, std::string message);
+  void terminateStateEarly(ExecutionState &state, const llvm::Twine &message);
   // call exit handler and terminate state
   void terminateStateOnExit(ExecutionState &state);
   // call error handler and terminate state
   void terminateStateOnError(ExecutionState &state, 
-                             const std::string &message,
-                             const std::string &suffix,
-                             const std::string &longMessage="");
+                             const llvm::Twine &message,
+                             const char *suffix,
+                             const llvm::Twine &longMessage="");
 
   // call error handler and terminate state, for execution errors
   // (things that should not be possible, like illegal instruction or
   // unlowered instrinsic, or are unsupported, like inline assembly)
   void terminateStateOnExecError(ExecutionState &state, 
-                                 const std::string &message,
-                                 const std::string &info="") {
+                                 const llvm::Twine &message,
+                                 const llvm::Twine &info="") {
     terminateStateOnError(state, message, "exec.err", info);
   }