[PATCH] D59413: Fix isInSystemMacro in presence of macro and pasted token
Phabricator via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu May 16 05:40:00 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rC360885: Fix isInSystemMacro in presence of macro and pasted token (authored by serge_sans_paille, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D59413?vs=199585&id=199801#toc
Repository:
rC Clang
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59413/new/
https://reviews.llvm.org/D59413
Files:
include/clang/Basic/SourceManager.h
test/Misc/no-warn-in-system-macro.c
Index: include/clang/Basic/SourceManager.h
===================================================================
--- include/clang/Basic/SourceManager.h
+++ include/clang/Basic/SourceManager.h
@@ -1466,8 +1466,13 @@
// This happens when the macro is the result of a paste, in that case
// its spelling is the scratch memory, so we take the parent context.
- if (isWrittenInScratchSpace(getSpellingLoc(loc)))
- return isInSystemHeader(getSpellingLoc(getImmediateMacroCallerLoc(loc)));
+ // There can be several level of token pasting.
+ if (isWrittenInScratchSpace(getSpellingLoc(loc))) {
+ do {
+ loc = getImmediateMacroCallerLoc(loc);
+ } while (isWrittenInScratchSpace(getSpellingLoc(loc)));
+ return isInSystemMacro(loc);
+ }
return isInSystemHeader(getSpellingLoc(loc));
}
Index: test/Misc/no-warn-in-system-macro.c
===================================================================
--- test/Misc/no-warn-in-system-macro.c
+++ test/Misc/no-warn-in-system-macro.c
@@ -3,11 +3,16 @@
#include <no-warn-in-system-macro.c.inc>
+#define MACRO(x) x
+
int main(void)
{
double foo = 1.0;
if (isnan(foo))
return 1;
- return 0;
+
+ MACRO(isnan(foo));
+
+ return 0;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59413.199801.patch
Type: text/x-patch
Size: 1251 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190516/e3b36ba9/attachment-0001.bin>
More information about the cfe-commits
mailing list