improve filecheck's "scanning from here" caret position.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75371 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/FileCheck/FileCheck.cpp b/utils/FileCheck/FileCheck.cpp
index 8c46f4b..372b197 100644
--- a/utils/FileCheck/FileCheck.cpp
+++ b/utils/FileCheck/FileCheck.cpp
@@ -232,6 +232,17 @@
// Otherwise, we have an error, emit an error message.
SM.PrintMessage(CheckStr.second, "expected string not found in input",
"error");
+
+ // Print the scanning from here line. If the current position is at the end
+ // of a line, advance to the start of the next line.
+ const char *Scan = CurPtr;
+ while (Scan != BufferEnd &&
+ (*Scan == ' ' || *Scan == '\t'))
+ ++Scan;
+ if (*Scan == '\n' || *Scan == '\r')
+ CurPtr = Scan+1;
+
+
SM.PrintMessage(SMLoc::getFromPointer(CurPtr), "scanning from here",
"note");
return 1;