serge-sans-paille created this revision.
serge-sans-paille added a reviewer: rsmith.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
When a warning is raised from the expansion of a system macro that involves
pasted token, there was still situations were they were not skipped, as
showcased by this issue: https://bugzilla.redhat.com/show_bug.cgi?id=1472437
Repository:
rC Clang
https://reviews.llvm.org/D59413
Files:
clang/include/clang/Basic/SourceManager.h
clang/test/Misc/no-warn-in-system-macro.c
Index: clang/test/Misc/no-warn-in-system-macro.c
===================================================================
--- clang/test/Misc/no-warn-in-system-macro.c
+++ clang/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;
+
+ MACRO(isnan(foo));
+
return 0;
}
Index: clang/include/clang/Basic/SourceManager.h
===================================================================
--- clang/include/clang/Basic/SourceManager.h
+++ clang/include/clang/Basic/SourceManager.h
@@ -1463,8 +1463,11 @@
// 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: clang/test/Misc/no-warn-in-system-macro.c
===================================================================
--- clang/test/Misc/no-warn-in-system-macro.c
+++ clang/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;
+
+ MACRO(isnan(foo));
+
return 0;
}
Index: clang/include/clang/Basic/SourceManager.h
===================================================================
--- clang/include/clang/Basic/SourceManager.h
+++ clang/include/clang/Basic/SourceManager.h
@@ -1463,8 +1463,11 @@
// 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));
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
