Merge pull request #75706 from bnbarham/fix-header-guard-change

bnbarham · web-flow · commit 5b9aaf6ae253 · 2024-08-06T15:36:53.000-07:00
[ClangImporter] Correct check to ignore macro
diff --git a/lib/ClangImporter/ImportName.cpp b/lib/ClangImporter/ImportName.cpp
@@ -2378,7 +2378,7 @@ static bool shouldIgnoreMacro(StringRef name, const clang::MacroInfo *macro,
   if (macro->isUsedForHeaderGuard() && macro->getNumTokens() == 1) {
     auto tok = macro->tokens()[0];
     if (tok.is(clang::tok::numeric_constant) && tok.getLength() == 1 &&
-        PP.getSpellingOfSingleCharacterNumericConstant(tok) == '1')
+        PP.getSpellingOfSingleCharacterNumericConstant(tok) == 1)
       return true;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -2378,7 +2378,7 @@ static bool shouldIgnoreMacro(StringRef name, const clang::MacroInfo *macro,`
`2378`	`2378`	`if (macro->isUsedForHeaderGuard() && macro->getNumTokens() == 1) {`
`2379`	`2379`	`auto tok = macro->tokens()[0];`
`2380`	`2380`	`if (tok.is(clang::tok::numeric_constant) && tok.getLength() == 1 &&`
`2381`		`- PP.getSpellingOfSingleCharacterNumericConstant(tok) == '1')`
	`2381`	`+ PP.getSpellingOfSingleCharacterNumericConstant(tok) == 1)`
`2382`	`2382`	`return true;`
`2383`	`2383`	`}`
`2384`	`2384`