averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Compile Time Constant Extraction] Ensure macro-expanded declarations are visited in WMO

Browse Source 
Resolves rdar://130036855
This commit is contained in:
Artem Chikin
2024-06-25 14:22:38 -07:00
parent fbe7d89311
commit 1be5dbba38
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ConstExtract/ConstExtract.cpp
View File

@@ -572,6 +572,13 @@ gatherConstValuesForModule(const std::unordered_set<std::string> &Protocols,
NominalTypeConformanceCollector ConformanceCollector(Protocols, NominalTypeConformanceCollector ConformanceCollector(Protocols,
ConformanceDecls); ConformanceDecls);
Module->walk(ConformanceCollector); Module->walk(ConformanceCollector);
// Visit macro expanded extensions
for (auto *FU : Module->getFiles())
if (auto *synthesizedSF = FU->getSynthesizedFile())
for (auto D : synthesizedSF->getTopLevelDecls())
if (isa<ExtensionDecl>(D))
D->walk(ConformanceCollector);
for (auto *CD : ConformanceDecls) for (auto *CD : ConformanceDecls)
Result.emplace_back(evaluateOrDefault(CD->getASTContext().evaluator, Result.emplace_back(evaluateOrDefault(CD->getASTContext().evaluator,
ConstantValueInfoRequest{CD, Module}, ConstantValueInfoRequest{CD, Module},

4
test/ConstExtraction/ExtractFromMacroExpansion.swift
View File

@@ -7,6 +7,10 @@
// RUN: %target-swift-frontend -typecheck -emit-const-values-path %t/ExtractFromMacroExpansion.swiftconstvalues -const-gather-protocols-file %t/protocols.json -primary-file %s -load-plugin-library %t/%target-library-name(MacroDefinition) // RUN: %target-swift-frontend -typecheck -emit-const-values-path %t/ExtractFromMacroExpansion.swiftconstvalues -const-gather-protocols-file %t/protocols.json -primary-file %s -load-plugin-library %t/%target-library-name(MacroDefinition)
// RUN: cat %t/ExtractFromMacroExpansion.swiftconstvalues 2>&1 | %FileCheck %s // RUN: cat %t/ExtractFromMacroExpansion.swiftconstvalues 2>&1 | %FileCheck %s
// Do the same, but ensure the WMO compilation flow produces the same result
// RUN: %target-swift-frontend -typecheck -emit-const-values-path %t/ExtractFromMacroExpansionWMO.swiftconstvalues -const-gather-protocols-file %t/protocols.json -O %s -load-plugin-library %t/%target-library-name(MacroDefinition)
// RUN: cat %t/ExtractFromMacroExpansionWMO.swiftconstvalues 2>&1 | %FileCheck %s
protocol MyProto { } protocol MyProto { }
@freestanding(declaration, names: named(MacroAddedStruct)) @freestanding(declaration, names: named(MacroAddedStruct))