Author: akirtzidis
Date: Wed Apr 11 13:15:01 2012
New Revision: 154517
URL: http://llvm.org/viewvc/llvm-project?rev=154517&view=rev
Log:
[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
Modified:
cfe/trunk/test/Index/fix-its.c
cfe/trunk/tools/libclang/CIndex.cpp
Modified: cfe/trunk/test/Index/fix-its.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/fix-its.c?rev=154517&r1=154516&r2=154517&view=diff
==============================================================================
--- cfe/trunk/test/Index/fix-its.c (original)
+++ cfe/trunk/test/Index/fix-its.c Wed Apr 11 13:15:01 2012
@@ -8,7 +8,7 @@
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 @@
// 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));
+}
Modified: cfe/trunk/tools/libclang/CIndex.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=154517&r1=154516&r2=154517&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CIndex.cpp (original)
+++ cfe/trunk/tools/libclang/CIndex.cpp Wed Apr 11 13:15:01 2012
@@ -112,10 +112,11 @@
// 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);
}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
