summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-07-25 16:56:02 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-07-25 16:56:02 +0000
commit6d28d7f2a3079745a79fb95210e641ca844a902a (patch)
treece2038de035c6cf1a2987dd4c25186533303ebe0 /clang/lib/Lex
parent35f5320d8e3bd080bd6316ef13716adf011d89e9 (diff)
downloadbcm5719-llvm-6d28d7f2a3079745a79fb95210e641ca844a902a.tar.gz
bcm5719-llvm-6d28d7f2a3079745a79fb95210e641ca844a902a.zip
Rename SourceManager::getInstantiationRange to getExpansionRange.
llvm-svn: 135915
Diffstat (limited to 'clang/lib/Lex')
-rw-r--r--clang/lib/Lex/Lexer.cpp2
-rw-r--r--clang/lib/Lex/PPMacroExpansion.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp
index 0ea8c12a727..320971a6b82 100644
--- a/clang/lib/Lex/Lexer.cpp
+++ b/clang/lib/Lex/Lexer.cpp
@@ -687,7 +687,7 @@ SourceLocation Lexer::getLocForEndOfToken(SourceLocation Loc, unsigned Offset,
return SourceLocation(); // Points inside the macro expansion.
// Continue and find the location just after the macro expansion.
- Loc = SM.getInstantiationRange(Loc).second;
+ Loc = SM.getExpansionRange(Loc).second;
}
unsigned Len = Lexer::MeasureTokenLength(Loc, SM, Features);
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
index d4fb28046a6..52b1fd22da1 100644
--- a/clang/lib/Lex/PPMacroExpansion.cpp
+++ b/clang/lib/Lex/PPMacroExpansion.cpp
@@ -838,7 +838,7 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
// can matter for a function-like macro that expands to contain __LINE__.
// Skip down through expansion points until we find a file loc for the
// end of the expansion history.
- Loc = SourceMgr.getInstantiationRange(Loc).second;
+ Loc = SourceMgr.getExpansionRange(Loc).second;
PresumedLoc PLoc = SourceMgr.getPresumedLoc(Loc);
// __LINE__ expands to a simple numeric value.
OpenPOWER on IntegriCloud