more SourceLocation lexicon change: instead of referring to the
"logical" location, refer to the "instantiation" location.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62316 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/BugReporter.cpp b/lib/Analysis/BugReporter.cpp
index e6840c3..adb3325 100644
--- a/lib/Analysis/BugReporter.cpp
+++ b/lib/Analysis/BugReporter.cpp
@@ -94,7 +94,7 @@
os << ' ';
os << "Execution continues on line "
- << SMgr.getLogicalLineNumber(S->getLocStart()) << '.';
+ << SMgr.getInstantiationLineNumber(S->getLocStart()) << '.';
}
@@ -534,7 +534,7 @@
std::ostringstream os;
os << "Control jumps to line "
- << SMgr.getLogicalLineNumber(S->getLocStart()) << ".\n";
+ << SMgr.getInstantiationLineNumber(S->getLocStart()) << ".\n";
PD.push_front(new PathDiagnosticPiece(L, os.str()));
break;
@@ -548,23 +548,17 @@
if (Stmt* S = Dst->getLabel())
switch (S->getStmtClass()) {
-
- default: {
+ default:
os << "No cases match in the switch statement. "
"Control jumps to line "
- << SMgr.getLogicalLineNumber(S->getLocStart()) << ".\n";
- break;
- }
-
- case Stmt::DefaultStmtClass: {
- os << "Control jumps to the 'default' case at line "
- << SMgr.getLogicalLineNumber(S->getLocStart()) << ".\n";
-
+ << SMgr.getInstantiationLineNumber(S->getLocStart()) << ".\n";
break;
- }
+ case Stmt::DefaultStmtClass:
+ os << "Control jumps to the 'default' case at line "
+ << SMgr.getInstantiationLineNumber(S->getLocStart()) << ".\n";
+ break;
case Stmt::CaseStmtClass: {
-
os << "Control jumps to 'case ";
CaseStmt* Case = cast<CaseStmt>(S);
@@ -602,10 +596,9 @@
}
os << ":' at line "
- << SMgr.getLogicalLineNumber(S->getLocStart()) << ".\n";
+ << SMgr.getInstantiationLineNumber(S->getLocStart()) << ".\n";
break;
-
}
}
else {
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index d2d7ab8..af96c06 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -2541,7 +2541,7 @@
Stmt* FirstStmt = cast<PostStmt>(AllocNode->getLocation()).getStmt();
SourceManager& SMgr = BR.getContext().getSourceManager();
- unsigned AllocLine = SMgr.getLogicalLineNumber(FirstStmt->getLocStart());
+ unsigned AllocLine =SMgr.getInstantiationLineNumber(FirstStmt->getLocStart());
// Get the leak site. We may have multiple ExplodedNodes (one with the
// leak) that occur on the same line number; if the node with the leak
@@ -2559,7 +2559,7 @@
Stmt* S = getStmt(BR); // This is the statement where the leak occured.
assert (S);
- unsigned EndLine = SMgr.getLogicalLineNumber(S->getLocStart());
+ unsigned EndLine = SMgr.getInstantiationLineNumber(S->getLocStart());
// Look in the *trimmed* graph at the immediate predecessor of EndN. Does
// it occur on the same line?
@@ -2574,7 +2574,7 @@
Stmt* SPred = PredPS->getStmt();
// Predecessor at same line?
- if (SMgr.getLogicalLineNumber(SPred->getLocStart()) != EndLine) {
+ if (SMgr.getInstantiationLineNumber(SPred->getLocStart()) != EndLine) {
Hint = PathDiagnosticPiece::Below;
S = SPred;
}
diff --git a/lib/Analysis/GRExprEngineInternalChecks.cpp b/lib/Analysis/GRExprEngineInternalChecks.cpp
index d32318c..e7a644c 100644
--- a/lib/Analysis/GRExprEngineInternalChecks.cpp
+++ b/lib/Analysis/GRExprEngineInternalChecks.cpp
@@ -212,7 +212,8 @@
const CompoundLiteralExpr* CL = CR->getLiteralExpr();
os << "Address of stack memory associated with a compound literal "
"declared on line "
- << BR.getSourceManager().getLogicalLineNumber(CL->getLocStart())
+ << BR.getSourceManager()
+ .getInstantiationLineNumber(CL->getLocStart())
<< " returned.";
R = CL->getSourceRange();
@@ -223,7 +224,7 @@
R = ARE->getSourceRange();
os << "Address of stack memory allocated by call to alloca() on line "
- << BR.getSourceManager().getLogicalLineNumber(L)
+ << BR.getSourceManager().getInstantiationLineNumber(L)
<< " returned.";
}
else {