hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 18:25:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into redsun82/swift-precompiled-modules-are-not-extracted

Browse Source
This commit is contained in:
Paolo Tranquilli
2022-07-29 15:57:52 +02:00
parent 099ab0e0c2 593ce01362
commit 405d0fcd54
6 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
swift/extractor/visitors/DeclVisitor.cpp
View File

@@ -115,7 +115,9 @@ codeql::PatternBindingDecl DeclVisitor::translatePatternBindingDecl(
std::optional<codeql::ConcreteVarDecl> DeclVisitor::translateVarDecl(const swift::VarDecl& decl) {
std::optional<codeql::ConcreteVarDecl> entry;
if (decl.getDeclContext()->isLocalContext()) {
// We do not deduplicate variables from non-swift (PCM, clang modules) modules as the mangler
// crashes sometimes
if (decl.getDeclContext()->isLocalContext() || decl.getModuleContext()->isNonSwiftModule()) {
entry.emplace(dispatcher_.assignNewLabel(decl));
} else {
entry = createNamedEntry(decl);
@@ -296,6 +298,14 @@ std::string DeclVisitor::mangledName(const swift::ValueDecl& decl) {
if (decl.getKind() == swift::DeclKind::Module) {
return static_cast<const swift::ModuleDecl&>(decl).getRealName().str().str();
}
// In cases like this (when coming from PCM)
// typealias CFXMLTree = CFTree
// typealias CFXMLTreeRef = CFXMLTree
// mangleAnyDecl mangles both CFXMLTree and CFXMLTreeRef into 'So12CFXMLTreeRefa'
// which is not correct and causes inconsistencies. mangleEntity makes these two distinct
if (decl.getKind() == swift::DeclKind::TypeAlias) {
return mangler.mangleEntity(&decl);
}
// prefix adds a couple of special symbols, we don't necessary need them
return mangler.mangleAnyDecl(&decl, /* prefix = */ false);
}