Index: include/clang/Basic/SourceManager.h =================================================================== --- include/clang/Basic/SourceManager.h +++ include/clang/Basic/SourceManager.h @@ -330,6 +330,7 @@ SourceLocation::getFromRawEncoding(ExpansionLocEnd).isInvalid(); } + bool isMacroBodyExpansion() const { return getExpansionLocStart().isValid() && SourceLocation::getFromRawEncoding(ExpansionLocEnd).isValid(); @@ -1151,6 +1152,16 @@ /// expanded. bool isMacroArgExpansion(SourceLocation Loc) const; + /// \brief Tests whether the given source location represents a macro + /// argument's expansion into the function-like macro definition. + /// + /// Such source locations only appear inside of the expansion + /// locations representing where a particular function-like macro was + /// expanded. + /// If the return value is true, the RawCode will store the raw encoding + /// of the source location of the expanded argument. + bool isMacroArgExpansion(SourceLocation Loc, SourceLocation &NewLoc) const; + /// \brief Tests whether the given source location represents the expansion of /// a macro body. /// Index: lib/Basic/SourceManager.cpp =================================================================== --- lib/Basic/SourceManager.cpp +++ lib/Basic/SourceManager.cpp @@ -1012,6 +1012,17 @@ return Expansion.isMacroArgExpansion(); } +bool SourceManager::isMacroArgExpansion(SourceLocation Loc, + SourceLocation &NewLoc) const { + if (!Loc.isMacroID()) return false; + + FileID FID = getFileID(Loc); + const SrcMgr::ExpansionInfo &Expansion = getSLocEntry(FID).getExpansion(); + if (!Expansion.isMacroArgExpansion()) return false; + NewLoc = Expansion.getExpansionLocStart(); + return true; +} + bool SourceManager::isMacroBodyExpansion(SourceLocation Loc) const { if (!Loc.isMacroID()) return false; Index: lib/Frontend/DiagnosticRenderer.cpp =================================================================== --- lib/Frontend/DiagnosticRenderer.cpp +++ lib/Frontend/DiagnosticRenderer.cpp @@ -306,6 +306,65 @@ } } +/// A recursive function to trace all possible backtrace locations +/// to match the \p CaretLocFileID. + +static bool retrieveBeginLocation(SourceLocation &Begin, + FileID &BeginFileID, + FileID CaretLocFileID, + const SourceManager *SM) { + if (BeginFileID == CaretLocFileID) return true; + if (!Begin.isMacroID()) return false; + SourceLocation Backup = Begin; + Begin = SM->getImmediateMacroCallerLoc(Begin); + if (SM->isMacroArgExpansion(Backup)) + Backup = SM->getImmediateExpansionRange(Backup).first; + else + Backup = SM->getImmediateSpellingLoc(Backup); + BeginFileID = SM->getFileID(Begin); + if (retrieveBeginLocation(Begin,BeginFileID,CaretLocFileID,SM)) return true; + Begin = Backup; + BeginFileID = SM->getFileID(Backup); + return retrieveBeginLocation(Begin,BeginFileID,CaretLocFileID,SM); +} + +static bool retrieveEndLocation(SourceLocation &End, + FileID &EndFileID, + FileID CaretLocFileID, + const SourceManager *SM) { + if (EndFileID == CaretLocFileID) return true; + if (!End.isMacroID()) return false; + SourceLocation Backup = End; + End = SM->getImmediateMacroCallerLoc(End); + if (SM->isMacroArgExpansion(Backup)) + Backup = SM->getImmediateExpansionRange(Backup).second; + else { + End = SM->getImmediateExpansionRange(Backup).second; + Backup = SM->getImmediateSpellingLoc(Backup); + } + EndFileID = SM->getFileID(End); + if (retrieveEndLocation(End,EndFileID,CaretLocFileID,SM)) return true; + End = Backup; + EndFileID = SM->getFileID(Backup); + return retrieveEndLocation(End,EndFileID,CaretLocFileID,SM); +} + +/// Helper function to print out all the backtrace locations +/// for a source location. + +static void retrieveAllBacktraces(SourceLocation Loc, + const SourceManager *SM) { + llvm::errs() << "New level\n"; + llvm::errs() << Loc.printToString(*SM) << " " << + SM->getFileID(Loc).getHashValue() << "\n"; + if (!Loc.isMacroID()) return; + if (SM->isMacroArgExpansion(Loc)) llvm::errs() << "is Macro Arg Expansion\n"; + llvm::errs() << "Down Spelling Loc\n"; + retrieveAllBacktraces(SM->getImmediateSpellingLoc(Loc),SM); + llvm::errs() << "Down Expansion Range\n"; + retrieveAllBacktraces(SM->getImmediateExpansionRange(Loc).first,SM); +} + // Helper function to fix up source ranges. It takes in an array of ranges, // and outputs an array of ranges where we want to draw the range highlighting // around the location specified by CaretLoc. @@ -323,9 +382,9 @@ const SourceManager *SM) { FileID CaretLocFileID = SM->getFileID(CaretLoc); - for (ArrayRef::const_iterator I = Ranges.begin(), - E = Ranges.end(); - I != E; ++I) { + for (auto I = Ranges.begin(), E = Ranges.end(); I != E; ++I) { + if (I->isInvalid()) continue; + SourceLocation Begin = I->getBegin(), End = I->getEnd(); bool IsTokenRange = I->isTokenRange(); @@ -354,27 +413,14 @@ } } - while (Begin.isMacroID() && BeginFileID != CaretLocFileID) { - if (SM->isMacroArgExpansion(Begin)) { - Begin = SM->getImmediateSpellingLoc(Begin); - End = SM->getImmediateSpellingLoc(End); - } else { - Begin = SM->getImmediateExpansionRange(Begin).first; - 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; - } - } + // Do the backtracking. + if (!retrieveBeginLocation(Begin,BeginFileID,CaretLocFileID,SM)) continue; + if (!retrieveEndLocation(End,EndFileID,CaretLocFileID,SM)) continue; // Return the spelling location of the beginning and end of the range. Begin = SM->getSpellingLoc(Begin); End = SM->getSpellingLoc(End); + SpellingRanges.push_back(CharSourceRange(SourceRange(Begin, End), IsTokenRange)); } @@ -417,20 +463,36 @@ SpellingRanges, None, &SM); } +static bool checkLocForMacroArgExpansion(SourceLocation Loc, + const SourceManager &SM, + SourceLocation &PreLoc) { + SourceLocation NewLoc = SourceLocation(); + if (SM.isMacroArgExpansion(Loc, NewLoc)) { + if (PreLoc == SourceLocation() || NewLoc == SourceLocation() + || PreLoc == NewLoc) { + if (PreLoc == SourceLocation()) PreLoc = NewLoc; + return true; + } + } + return false; +} + static bool checkRangeForMacroArgExpansion(CharSourceRange Range, - const SourceManager &SM) { + const SourceManager &SM, + SourceLocation &Loc) { SourceLocation BegLoc = Range.getBegin(), EndLoc = Range.getEnd(); while (BegLoc != EndLoc) { - if (!SM.isMacroArgExpansion(BegLoc)) + if (!checkLocForMacroArgExpansion(BegLoc, SM, Loc)) return false; BegLoc.getLocWithOffset(1); } - return SM.isMacroArgExpansion(BegLoc); + return checkLocForMacroArgExpansion(BegLoc, SM, Loc); } -/// A helper function to check if the current ranges are all inside +/// A helper function to check if the current ranges are all inside /// the macro expansions. + static bool checkRangesForMacroArgExpansion(SourceLocation Loc, ArrayRef Ranges, const SourceManager &SM) { @@ -439,12 +501,25 @@ SmallVector SpellingRanges; mapDiagnosticRanges(Loc, Ranges, SpellingRanges, &SM); - if (!SM.isMacroArgExpansion(Loc)) + /// Count all valid ranges. + unsigned ValidCount = 0; + for (auto I:Ranges) + if (I.isValid()) ValidCount++; + + if (ValidCount > SpellingRanges.size()) + return false; + + /// To store the raw encoding of the argument location. + SourceLocation SameLoc = SourceLocation(); + + if (!SM.isMacroArgExpansion(Loc,SameLoc)) return false; - for (auto I = SpellingRanges.begin(), E = SpellingRanges.end(); I != E; ++I) - if (!checkRangeForMacroArgExpansion(*I, SM)) + for (auto I = SpellingRanges.begin(), E = SpellingRanges.end(); + I != E; ++I) { + if (!checkRangeForMacroArgExpansion(*I, SM, SameLoc)) return false; + } return true; } @@ -491,7 +566,7 @@ assert(!Loc.isInvalid() && "must have a valid source location here"); } - LocationStack.erase(LocationStack.begin(), + LocationStack.erase(LocationStack.begin(), LocationStack.begin() + IgnoredEnd); unsigned MacroDepth = LocationStack.size(); Index: test/Index/fix-its.m =================================================================== --- test/Index/fix-its.m +++ test/Index/fix-its.m @@ -20,7 +20,3 @@ @end // CHECK: FIX-IT: Insert "@" at 18:22 -// CHECK: fix-its.m:9:28: note: expanded from macro '_rdar_12584554_C' -// CHECK: Number FIX-ITs = 0 -// CHECK: fix-its.m:7:77: note: expanded from macro '_rdar_12584554_B' -// CHECK: Number FIX-ITs = 0 Index: test/Misc/caret-diags-macros.c =================================================================== --- test/Misc/caret-diags-macros.c +++ test/Misc/caret-diags-macros.c @@ -16,9 +16,6 @@ void bar() { C(1); // CHECK: {{.*}}:17:5: warning: expression result unused - // CHECK: {{.*}}:15:16: note: expanded from macro 'C' - // CHECK: {{.*}}:14:16: note: expanded from macro 'B' - // CHECK: {{.*}}:13:14: note: expanded from macro 'A' } // rdar://7597492 @@ -41,48 +38,45 @@ void test() { macro_args3(11); - // CHECK: {{.*}}:43:15: warning: expression result unused + // CHECK: {{.*}}:40:15: warning: expression result unused // Also check that the 'caret' printing agrees with the location here where // its easy to FileCheck. // CHECK-NEXT: macro_args3(11); // CHECK-NEXT: {{^ \^~}} - // CHECK: {{.*}}:36:36: note: expanded from macro 'macro_args3' - // CHECK: {{.*}}:35:36: note: expanded from macro 'macro_args2' - // CHECK: {{.*}}:34:24: note: expanded from macro 'macro_args1' macro_many_args3( 1, 2, 3); - // CHECK: {{.*}}:55:5: warning: expression result unused - // CHECK: {{.*}}:40:55: note: expanded from macro 'macro_many_args3' - // CHECK: {{.*}}:39:55: note: expanded from macro 'macro_many_args2' - // CHECK: {{.*}}:38:35: note: expanded from macro 'macro_many_args1' + // CHECK: {{.*}}:49:5: warning: expression result unused + // CHECK: {{.*}}:37:55: note: expanded from macro 'macro_many_args3' + // CHECK: {{.*}}:36:55: note: expanded from macro 'macro_many_args2' + // CHECK: {{.*}}:35:35: note: expanded from macro 'macro_many_args1' macro_many_args3( 1, M2, 3); - // CHECK: {{.*}}:64:5: warning: expression result unused + // CHECK: {{.*}}:58:5: warning: expression result unused // CHECK: {{.*}}:4:12: note: expanded from macro 'M2' - // CHECK: {{.*}}:40:55: note: expanded from macro 'macro_many_args3' - // CHECK: {{.*}}:39:55: note: expanded from macro 'macro_many_args2' - // CHECK: {{.*}}:38:35: note: expanded from macro 'macro_many_args1' + // CHECK: {{.*}}:37:55: note: expanded from macro 'macro_many_args3' + // CHECK: {{.*}}:36:55: note: expanded from macro 'macro_many_args2' + // CHECK: {{.*}}:35:35: note: expanded from macro 'macro_many_args1' macro_many_args3( 1, macro_args2(22), 3); - // CHECK: {{.*}}:74:17: warning: expression result unused + // CHECK: {{.*}}:68:17: warning: expression result unused // This caret location needs to be printed *inside* a different macro's // arguments. // CHECK-NEXT: macro_args2(22), // CHECK-NEXT: {{^ \^~}} - // CHECK: {{.*}}:35:36: note: expanded from macro 'macro_args2' - // CHECK: {{.*}}:34:24: note: expanded from macro 'macro_args1' - // CHECK: {{.*}}:40:55: note: expanded from macro 'macro_many_args3' - // CHECK: {{.*}}:39:55: note: expanded from macro 'macro_many_args2' - // CHECK: {{.*}}:38:35: note: expanded from macro 'macro_many_args1' + // CHECK: {{.*}}:32:36: note: expanded from macro 'macro_args2' + // CHECK: {{.*}}:31:24: note: expanded from macro 'macro_args1' + // CHECK: {{.*}}:37:55: note: expanded from macro 'macro_many_args3' + // CHECK: {{.*}}:36:55: note: expanded from macro 'macro_many_args2' + // CHECK: {{.*}}:35:35: note: expanded from macro 'macro_many_args1' } #define variadic_args1(x, y, ...) y @@ -91,12 +85,12 @@ void test2() { variadic_args3(1, 22, 3, 4); - // CHECK: {{.*}}:93:21: warning: expression result unused + // CHECK: {{.*}}:87:21: warning: expression result unused // CHECK-NEXT: variadic_args3(1, 22, 3, 4); // CHECK-NEXT: {{^ \^~}} - // CHECK: {{.*}}:90:53: note: expanded from macro 'variadic_args3' - // CHECK: {{.*}}:89:50: note: expanded from macro 'variadic_args2' - // CHECK: {{.*}}:88:35: note: expanded from macro 'variadic_args1' + // CHECK: {{.*}}:84:53: note: expanded from macro 'variadic_args3' + // CHECK: {{.*}}:83:50: note: expanded from macro 'variadic_args2' + // CHECK: {{.*}}:82:35: note: expanded from macro 'variadic_args1' } #define variadic_pasting_args1(x, y, z) y @@ -107,35 +101,35 @@ void test3() { variadic_pasting_args3(1, 2, 3, 4); - // CHECK: {{.*}}:109:32: warning: expression result unused - // CHECK: {{.*}}:105:72: note: expanded from macro 'variadic_pasting_args3' - // CHECK: {{.*}}:103:68: note: expanded from macro 'variadic_pasting_args2' - // CHECK: {{.*}}:102:41: note: expanded from macro 'variadic_pasting_args1' + // CHECK: {{.*}}:103:32: warning: expression result unused + // CHECK: {{.*}}:99:72: note: expanded from macro 'variadic_pasting_args3' + // CHECK: {{.*}}:97:68: note: expanded from macro 'variadic_pasting_args2' + // CHECK: {{.*}}:96:41: note: expanded from macro 'variadic_pasting_args1' variadic_pasting_args3a(1, 2, 3, 4); - // CHECK: {{.*}}:115:3: warning: expression result unused + // CHECK: {{.*}}:109:3: warning: expression result unused // CHECK-NEXT: variadic_pasting_args3a(1, 2, 3, 4); - // CHECK-NEXT: {{ \^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~}} - // CHECK: {{.*}}:106:44: note: expanded from macro 'variadic_pasting_args3a' + // CHECK-NEXT: {{ \^~~~~~~~~~~~~~~~~~~~~~~}} + // CHECK: {{.*}}:100:44: note: expanded from macro 'variadic_pasting_args3a' // CHECK-NEXT: #define variadic_pasting_args3a(x, y, ...) variadic_pasting_args2a(x, y, __VA_ARGS__) - // CHECK-NEXT: {{ \^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~}} - // CHECK: {{.*}}:104:70: note: expanded from macro 'variadic_pasting_args2a' + // CHECK-NEXT: {{ \^~~~~~~~~~~~~~~~~~~~~~~}} + // CHECK: {{.*}}:98:70: note: expanded from macro 'variadic_pasting_args2a' // CHECK-NEXT: #define variadic_pasting_args2a(x, y, ...) variadic_pasting_args1(x, y ## __VA_ARGS__) // CHECK-NEXT: {{ \^~~~~~~~~~~~~~~~}} - // CHECK: {{.*}}:102:41: note: expanded from macro 'variadic_pasting_args1' + // CHECK: {{.*}}:96:41: note: expanded from macro 'variadic_pasting_args1' // CHECK-NEXT: #define variadic_pasting_args1(x, y, z) y // CHECK-NEXT: {{ \^}} } #define BAD_CONDITIONAL_OPERATOR (2<3)?2:3 int test4 = BAD_CONDITIONAL_OPERATOR+BAD_CONDITIONAL_OPERATOR; -// CHECK: {{.*}}:130:39: note: expanded from macro 'BAD_CONDITIONAL_OPERATOR' +// CHECK: {{.*}}:124:39: note: expanded from macro 'BAD_CONDITIONAL_OPERATOR' // CHECK-NEXT: #define BAD_CONDITIONAL_OPERATOR (2<3)?2:3 // CHECK-NEXT: {{^ \^}} -// CHECK: {{.*}}:130:39: note: expanded from macro 'BAD_CONDITIONAL_OPERATOR' +// CHECK: {{.*}}:124:39: note: expanded from macro 'BAD_CONDITIONAL_OPERATOR' // CHECK-NEXT: #define BAD_CONDITIONAL_OPERATOR (2<3)?2:3 // CHECK-NEXT: {{^ \^}} -// CHECK: {{.*}}:130:39: note: expanded from macro 'BAD_CONDITIONAL_OPERATOR' +// CHECK: {{.*}}:124:39: note: expanded from macro 'BAD_CONDITIONAL_OPERATOR' // CHECK-NEXT: #define BAD_CONDITIONAL_OPERATOR (2<3)?2:3 // CHECK-NEXT: {{^ ~~~~~\^~~~}} @@ -143,32 +137,32 @@ #define TWOL (2< #define X 1+TWOL 3) QMARK 4:5 int x = X; -// CHECK: {{.*}}:145:9: note: place parentheses around the '+' expression to silence this warning +// CHECK: {{.*}}:139:9: note: place parentheses around the '+' expression to silence this warning // CHECK-NEXT: int x = X; // CHECK-NEXT: {{^ \^}} -// CHECK-NEXT: {{.*}}:144:21: note: expanded from macro 'X' +// CHECK-NEXT: {{.*}}:138:21: note: expanded from macro 'X' // CHECK-NEXT: #define X 1+TWOL 3) QMARK 4:5 // CHECK-NEXT: {{^ ~~~~~~~~~ \^}} -// CHECK-NEXT: {{.*}}:142:15: note: expanded from macro 'QMARK' +// CHECK-NEXT: {{.*}}:136:15: note: expanded from macro 'QMARK' // CHECK-NEXT: #define QMARK ? // CHECK-NEXT: {{^ \^}} -// CHECK-NEXT: {{.*}}:145:9: note: place parentheses around the '?:' expression to evaluate it first +// CHECK-NEXT: {{.*}}:139:9: note: place parentheses around the '?:' expression to evaluate it first // CHECK-NEXT: int x = X; // CHECK-NEXT: {{^ \^}} -// CHECK-NEXT: {{.*}}:144:21: note: expanded from macro 'X' +// CHECK-NEXT: {{.*}}:138:21: note: expanded from macro 'X' // CHECK-NEXT: #define X 1+TWOL 3) QMARK 4:5 // CHECK-NEXT: {{^ ~~~~~~~~\^~~~~~~~~}} #define ONEPLUS 1+ #define Y ONEPLUS (2<3) QMARK 4:5 int y = Y; -// CHECK: {{.*}}:164:9: warning: operator '?:' has lower precedence than '+'; '+' will be evaluated first +// CHECK: {{.*}}:158:9: warning: operator '?:' has lower precedence than '+'; '+' will be evaluated first // CHECK-NEXT: int y = Y; // CHECK-NEXT: {{^ \^}} -// CHECK-NEXT: {{.*}}:163:25: note: expanded from macro 'Y' +// CHECK-NEXT: {{.*}}:157:25: note: expanded from macro 'Y' // CHECK-NEXT: #define Y ONEPLUS (2<3) QMARK 4:5 // CHECK-NEXT: {{^ ~~~~~~~~~~~~~ \^}} -// CHECK-NEXT: {{.*}}:142:15: note: expanded from macro 'QMARK' +// CHECK-NEXT: {{.*}}:136:15: note: expanded from macro 'QMARK' // CHECK-NEXT: #define QMARK ? // CHECK-NEXT: {{^ \^}} @@ -179,10 +173,10 @@ #define /* */ BARC(c, /* */b, a) (a + b ? c : c) iequals(__LINE__, BARC(123, (456 < 345), 789), 8); } -// CHECK: {{.*}}:180:21: warning: operator '?:' has lower precedence than '+' +// CHECK: {{.*}}:174:21: warning: operator '?:' has lower precedence than '+' // CHECK-NEXT: iequals(__LINE__, BARC(123, (456 < 345), 789), 8); // CHECK-NEXT: {{^ \^~~~~~~~~~~~~~~~~~~~~~~~~~~}} -// CHECK-NEXT: {{.*}}:179:41: note: expanded from macro 'BARC' +// CHECK-NEXT: {{.*}}:173:41: note: expanded from macro 'BARC' // CHECK-NEXT: #define /* */ BARC(c, /* */b, a) (a + b ? c : c) // CHECK-NEXT: {{^ ~~~~~ \^}} @@ -193,16 +187,16 @@ #if UTARG_MAX_U #endif -// CHECK: {{.*}}:193:5: warning: left side of operator converted from negative value to unsigned: -1 to 18446744073709551615 +// CHECK: {{.*}}:187:5: warning: left side of operator converted from negative value to unsigned: -1 to 18446744073709551615 // CHECK-NEXT: #if UTARG_MAX_U // CHECK-NEXT: {{^ \^~~~~~~~~~~}} -// CHECK-NEXT: {{.*}}:191:21: note: expanded from macro 'UTARG_MAX_U' +// CHECK-NEXT: {{.*}}:185:21: note: expanded from macro 'UTARG_MAX_U' // CHECK-NEXT: #define UTARG_MAX_U APPEND (MAX_UINT, UL) // CHECK-NEXT: {{^ \^~~~~~~~~~~~~~~~~~~~~}} -// CHECK-NEXT: {{.*}}:190:27: note: expanded from macro 'APPEND' +// CHECK-NEXT: {{.*}}:184:27: note: expanded from macro 'APPEND' // CHECK-NEXT: #define APPEND(NUM, SUFF) APPEND2(NUM, SUFF) // CHECK-NEXT: {{^ \^~~~~~~~~~~~~~~~~~}} -// CHECK-NEXT: {{.*}}:189:31: note: expanded from macro 'APPEND2' +// CHECK-NEXT: {{.*}}:183:31: note: expanded from macro 'APPEND2' // CHECK-NEXT: #define APPEND2(NUM, SUFF) -1 != NUM ## SUFF // CHECK-NEXT: {{^ ~~ \^ ~~~~~~~~~~~}} @@ -213,15 +207,15 @@ #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)); +Csprintf(pMsgBuf,"\nEnter minimum anagram length (2-%1d): ", strlen_test(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: {{.*}}:210:62: warning: format specifies type 'int' but the argument has type 'unsigned long' +// CHECK-NEXT: Csprintf(pMsgBuf,"\nEnter minimum anagram length (2-%1d): ", strlen_test(pKeepBuf)); +// CHECK-NEXT: {{^ ~~~ \^~~~~~~~~~~~~~~~~~~~~}} // CHECK-NEXT: {{^ %1lu}} -// CHECK-NEXT: {{.*}}:213:21: note: expanded from macro 'Cstrlen' -// CHECK-NEXT: #define Cstrlen(a) strlen_test(a) +// CHECK-NEXT: {{.*}}:208:21: note: expanded from macro 'Csprintf' +// CHECK-NEXT: #define Csprintf sprintf2 // CHECK-NEXT: {{^ \^}} -// CHECK-NEXT: {{.*}}:212:56: note: expanded from macro 'sprintf2' +// CHECK-NEXT: {{.*}}:206:56: note: expanded from macro 'sprintf2' // CHECK-NEXT: __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__) -// CHECK-NEXT: {{^ \^}} +// CHECK-NEXT: {{^ \^~~~~~~~~~~}} Index: test/Misc/diag-macro-backtrace2.c =================================================================== --- test/Misc/diag-macro-backtrace2.c +++ test/Misc/diag-macro-backtrace2.c @@ -16,7 +16,7 @@ // CHECK: :15:3: error: invalid operands to binary expression // CHECK: ('const char *' and 'int') // CHECK: a(str); - // CHECK: ^ ~~~ + // CHECK: ^~~~~~ // CHECK: :3:11: note: expanded from macro 'a' // CHECK: #define a b // CHECK: ^ @@ -28,7 +28,7 @@ // CHECK: ^~~~ // CHECK: :6:15: note: expanded from macro 'd' // CHECK: #define d(x) x*1 - // CHECK: ^~ + // CHECK: ~^~ e(str); // CHECK: :33:5: warning: expression result unused Index: test/Misc/reduced-diags-macros.cpp =================================================================== --- test/Misc/reduced-diags-macros.cpp +++ test/Misc/reduced-diags-macros.cpp @@ -11,7 +11,7 @@ // CHECK-NEXT: ~~~~~~~~~~~~~~^~ // CHECK-NEXT: {{.*}}:3:34: note: expanded from macro 'NO_INITIATION' // CHECK-NEXT: #define NO_INITIATION(x) int a = x * 2 -// CHECK-NEXT: ^ +// CHECK-NEXT: ~ ^ // CHECK: {{.*}}:7:15: error: use of undeclared identifier 'b' // CHECK-NEXT: NO_DEFINITION(b); @@ -27,3 +27,18 @@ // CHECK: {{.*}}:25:23: error: use of undeclared identifier 'x' // CHECK-NEXT: int p = SWAP_ARGU(3, x); // CHECK-NEXT: ^ + +#define APPLY(f,x,y) x f y + +struct node { +}; + +node ff; + +int r = APPLY(+,ff,1); +// CHECK: {{.*}}:38:15: error: invalid operands to binary expression ('node' and 'int') +// CHECK-NEXT: int r = APPLY(+,ff,1); +// CHECK-NEXT: ^ ~~ ~ +// CHECK-NEXT: {{.*}}:31:24: note: expanded from macro 'APPLY' +// CHECK-NEXT: #define APPLY(f,x,y) x f y +// CHECK-NEXT: ~ ^ ~ \ No newline at end of file Index: test/Misc/serialized-diags.c =================================================================== --- test/Misc/serialized-diags.c +++ test/Misc/serialized-diags.c @@ -55,7 +55,6 @@ // CHECK: Range: {{.*[/\\]}}serialized-diags.c:22:3 {{.*[/\\]}}serialized-diags.c:22:6 // CHECK: Range: {{.*[/\\]}}serialized-diags.c:22:13 {{.*[/\\]}}serialized-diags.c:22:18 // CHECK: +-{{.*[/\\]}}serialized-diags.c:20:15: note: expanded from macro 'false' [] -// CHECK: +-Range: {{.*[/\\]}}serialized-diags.c:22:3 {{.*[/\\]}}serialized-diags.c:22:6 // CHECK: +-Range: {{.*[/\\]}}serialized-diags.c:20:15 {{.*[/\\]}}serialized-diags.c:20:16 // CHECK: +-{{.*[/\\]}}serialized-diags.c:19:1: note: 'taz' declared here [] // CHECK: {{.*[/\\]}}serialized-diags.h:5:7: warning: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion]