Skip to content

Commit 48e93b3

Browse files
authored
Merge pull request #9925 from github/alexdenisov/pcm-var-dedup
Swift: do not deduplicate PCM variables (as the mangler crashes there sometimes)
2 parents 22c5b7a + 5b1fe56 commit 48e93b3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

swift/extractor/visitors/DeclVisitor.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ codeql::PatternBindingDecl DeclVisitor::translatePatternBindingDecl(
115115

116116
std::optional<codeql::ConcreteVarDecl> DeclVisitor::translateVarDecl(const swift::VarDecl& decl) {
117117
std::optional<codeql::ConcreteVarDecl> entry;
118-
if (decl.getDeclContext()->isLocalContext()) {
118+
// We do not deduplicate variables from non-swift (PCM, clang modules) modules as the mangler
119+
// crashes sometimes
120+
if (decl.getDeclContext()->isLocalContext() || decl.getModuleContext()->isNonSwiftModule()) {
119121
entry.emplace(dispatcher_.assignNewLabel(decl));
120122
} else {
121123
entry = createNamedEntry(decl);

0 commit comments

Comments
 (0)