From b737b76ce25ded750fa0d10b10414566c0856810 Mon Sep 17 00:00:00 2001
From: Cristian Cadar <c.cadar@imperial.ac.uk>
Date: Thu, 17 May 2018 11:53:08 +0100
Subject: Renamed printFileLine to getSourceLocation (as suggested by
 @delcypher) to reflect the fact that it simply returns a string

---
 lib/Core/Executor.cpp     | 4 ++--
 lib/Core/ExecutorUtil.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/Core')

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 03ac1331..f0781e5b 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -1153,7 +1153,7 @@ void Executor::printDebugInstructions(ExecutionState &state) {
 
   if (!DebugPrintInstructions.isSet(STDERR_COMPACT) &&
       !DebugPrintInstructions.isSet(FILE_COMPACT)) {
-    (*stream) << "     " << state.pc->printFileLine() << ":";
+    (*stream) << "     " << state.pc->getSourceLocation() << ":";
   }
 
   (*stream) << state.pc->info->assemblyLine;
@@ -3080,7 +3080,7 @@ void Executor::callExternalFunction(ExecutionState &state,
       if (i != arguments.size()-1)
         os << ", ";
     }
-    os << ") at " << state.pc->printFileLine();
+    os << ") at " << state.pc->getSourceLocation();
     
     if (AllExternalWarnings)
       klee_warning("%s", os.str().c_str());
diff --git a/lib/Core/ExecutorUtil.cpp b/lib/Core/ExecutorUtil.cpp
index 355f6f78..63967ae5 100644
--- a/lib/Core/ExecutorUtil.cpp
+++ b/lib/Core/ExecutorUtil.cpp
@@ -128,7 +128,7 @@ namespace klee {
         std::string msg("Cannot handle constant ");
         llvm::raw_string_ostream os(msg);
         os << "'" << *c << "' at location "
-           << (ki ? ki->printFileLine().c_str() : "[unknown]");
+           << (ki ? ki->getSourceLocation().c_str() : "[unknown]");
         klee_error("%s", os.str().c_str());
       }
     }
@@ -154,7 +154,7 @@ namespace klee {
       if (op2->getLimitedValue() == 0) {
         std::string msg("Division/modulo by zero during constant folding at location ");
         llvm::raw_string_ostream os(msg);
-        os << (ki ? ki->printFileLine().c_str() : "[unknown]");
+        os << (ki ? ki->getSourceLocation().c_str() : "[unknown]");
         klee_error("%s", os.str().c_str());
       }
       break;
@@ -164,7 +164,7 @@ namespace klee {
       if (op2->getLimitedValue() >= op1->getWidth()) {
         std::string msg("Overshift during constant folding at location ");
         llvm::raw_string_ostream os(msg);
-        os << (ki ? ki->printFileLine().c_str() : "[unknown]");
+        os << (ki ? ki->getSourceLocation().c_str() : "[unknown]");
         klee_error("%s", os.str().c_str());
       }
     }
@@ -175,7 +175,7 @@ namespace klee {
     switch (ce->getOpcode()) {
     default :
       os << "'" << *ce << "' at location "
-         << (ki ? ki->printFileLine().c_str() : "[unknown]");
+         << (ki ? ki->getSourceLocation().c_str() : "[unknown]");
       klee_error("%s", os.str().c_str());
 
     case Instruction::Trunc: 
-- 
cgit 1.4.1