maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

More conservative fix for <rdar://problem/12847524> (a crash printing diagnostic ranges). 

I'm not really happy with this fix, but I'm confident it's correct.

llvm-svn: 170397
This commit is contained in:
Eli Friedman 2012-12-18 00:52:36 +00:00
parent f53f578567
commit 672845bcde
2 changed files with 27 additions and 0 deletions

7
clang/lib/Frontend/DiagnosticRenderer.cpp
View File

@ -363,6 +363,13 @@ static void mapDiagnosticRanges(
End = SM->getImmediateExpansionRange(End).second;
}
BeginFileID = SM->getFileID(Begin);
if (BeginFileID != SM->getFileID(End)) {
// FIXME: Ugly hack to stop a crash; this code is making bad
// assumptions and it's too complicated for me to reason
// about.
Begin = End = SourceLocation();
break;
}
}
// Return the spelling location of the beginning and end of the range.

20
clang/test/Misc/caret-diags-macros.c
View File

@ -205,3 +205,23 @@ void foo_aa()
// CHECK-NEXT: {{.*}}:189:31: note: expanded from macro 'APPEND2'
// CHECK-NEXT: #define APPEND2(NUM, SUFF) -1 != NUM ## SUFF
// CHECK-NEXT: {{^ ~~ \^ ~~~~~~~~~~~}}
unsigned long strlen_test(const char *s);
#define __darwin_obsz(object) __builtin_object_size (object, 1)
#define sprintf2(str, ...) \
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
#define Cstrlen(a) strlen_test(a)
#define Csprintf sprintf2
void f(char* pMsgBuf, char* pKeepBuf) {
Csprintf(pMsgBuf,"\nEnter minimum anagram length (2-%1d): ", Cstrlen(pKeepBuf));
}
// CHECK: {{.*}}:216:62: warning: format specifies type 'int' but the argument has type 'unsigned long'
// CHECK-NEXT: Csprintf(pMsgBuf,"\nEnter minimum anagram length (2-%1d): ", Cstrlen(pKeepBuf));
// CHECK-NEXT: {{^ ~~~ \^}}
// CHECK-NEXT: {{^ %1ld}}
// CHECK-NEXT: {{.*}}:213:21: note: expanded from macro 'Cstrlen'
// CHECK-NEXT: #define Cstrlen(a) strlen_test(a)
// CHECK-NEXT: {{^ \^}}
// CHECK-NEXT: {{.*}}:212:56: note: expanded from macro 'sprintf2'
// CHECK-NEXT: __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
// CHECK-NEXT: {{^ \^}}