replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libclang] In cxloc::translateSourceRange make sure to handle locations in macro arguments 

correctly. clang diagnostics can provide fixits inside a macro argument now.

rdar://11014346

llvm-svn: 154517
This commit is contained in:
Argyrios Kyrtzidis 2012-04-11 18:15:01 +00:00
parent be646db000
commit 408403c4b5
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/test/Index/fix-its.c
View File

@ -8,7 +8,7 @@ struct X {
void f(struct X *x) {
// CHECK: error: no member named 'wobble' in 'struct X'; did you mean 'wibble'?
// CHECK: FIX-IT: Replace [13:12 - 13:24] with "wibble"
// CHECK: FIX-IT: Replace [13:12 - 13:18] with "wibble"
// CHECK: note: 'wibble' declared here
MACRO(x->wobble = 17);
// CHECK: error: no member named 'wabble' in 'struct X'; did you mean 'wibble'?
@ -16,3 +16,12 @@ void f(struct X *x) {
// CHECK: note: 'wibble' declared here
x->wabble = 17;
}
int printf(const char *restrict, ...);
void f2() {
unsigned long index;
// CHECK: warning: format specifies type 'int' but the argument has type 'unsigned long'
// CHECK: FIX-IT: Replace [26:17 - 26:19] with "%ld"
MACRO(printf("%d", index));
}

7
clang/tools/libclang/CIndex.cpp
View File

@ -112,10 +112,11 @@ CXSourceRange cxloc::translateSourceRange(const SourceManager &SM,
// We want the last character in this location, so we will adjust the
// location accordingly.
SourceLocation EndLoc = R.getEnd();
if (EndLoc.isValid() && EndLoc.isMacroID())
if (EndLoc.isValid() && EndLoc.isMacroID() && !SM.isMacroArgExpansion(EndLoc))
EndLoc = SM.getExpansionRange(EndLoc).second;
if (R.isTokenRange() && !EndLoc.isInvalid() && EndLoc.isFileID()) {
unsigned Length = Lexer::MeasureTokenLength(EndLoc, SM, LangOpts);
if (R.isTokenRange() && !EndLoc.isInvalid()) {
unsigned Length = Lexer::MeasureTokenLength(SM.getSpellingLoc(EndLoc),
SM, LangOpts);
EndLoc = EndLoc.getLocWithOffset(Length);
}