Skip to content

Commit 16e90d7

Browse files
kateinoigakukunkateinoigakukun
committed
Fix bad merge issues
1 parent fbeca65 commit 16e90d7

File tree

10 files changed

+38
-44
lines changed

10 files changed

+38
-44
lines changed

‎include/swift/Basic/FileTypes.def‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ TYPE("dSYM", dSYM, "dSYM", "")
4848
TYPE("dependencies", Dependencies, "d", "")
4949
TYPE("autolink", AutolinkFile, "autolink", "")
5050
TYPE("swiftmodule", SwiftModuleFile, "swiftmodule", "")
51-
TYPE("swiftmodule-summary", SwiftModuleSummaryFile, "swiftmodule.summary", "")
5251
TYPE("swiftdoc", SwiftModuleDocFile, "swiftdoc", "")
5352
TYPE("swiftinterface", SwiftModuleInterfaceFile, "swiftinterface", "")
5453
TYPE("private-swiftinterface", PrivateSwiftModuleInterfaceFile, "private.swiftinterface", "")

‎include/swift/Option/FrontendOptions.td‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ def emit_module_doc_path
4141
def emit_module_source_info : Flag<["-"], "emit-module-source-info">,
4242
HelpText<"Output module source info file">;
4343

44-
def emit_module_summary : Flag<["-"], "emit-module-summary">,
45-
HelpText<"Emit module summary">;
46-
4744
def module_summary_path
4845
: Separate<["-"], "module-summary-path">, MetaVarName<"<path>">,
4946
HelpText<"Combined module summary file <path>">;

‎lib/Basic/FileTypes.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ bool file_types::isTextual(ID Id) {
9090
case file_types::TY_PCH:
9191
case file_types::TY_SIB:
9292
case file_types::TY_RawSIB:
93-
case file_types::TY_SwiftModuleSummaryFile:
9493
case file_types::TY_SwiftModuleFile:
9594
case file_types::TY_SwiftModuleDocFile:
9695
case file_types::TY_SwiftSourceInfoFile:
@@ -140,7 +139,6 @@ bool file_types::isAfterLLVM(ID Id) {
140139
case file_types::TY_SwiftModuleDocFile:
141140
case file_types::TY_SwiftSourceInfoFile:
142141
case file_types::TY_SwiftCrossImportDir:
143-
case file_types::TY_SwiftModuleSummaryFile:
144142
case file_types::TY_SwiftOverlayFile:
145143
case file_types::TY_SwiftModuleSummaryFile:
146144
case file_types::TY_SerializedDiagnostics:
@@ -192,7 +190,6 @@ bool file_types::isPartOfSwiftCompilation(ID Id) {
192190
case file_types::TY_PrivateSwiftModuleInterfaceFile:
193191
case file_types::TY_SwiftSourceInfoFile:
194192
case file_types::TY_SwiftCrossImportDir:
195-
case file_types::TY_SwiftModuleSummaryFile:
196193
case file_types::TY_SwiftOverlayFile:
197194
case file_types::TY_SwiftModuleSummaryFile:
198195
case file_types::TY_SerializedDiagnostics:

‎lib/Driver/Driver.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2057,9 +2057,8 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
20572057
case file_types::TY_BitstreamOptRecord:
20582058
case file_types::TY_SwiftModuleInterfaceFile:
20592059
case file_types::TY_PrivateSwiftModuleInterfaceFile:
2060-
case file_types::TY_SwiftModuleSummaryFile:
20612060
case file_types::TY_SwiftCrossImportDir:
2062-
case file_types::TY_SwiftModuleSummaryFile: // FIXME(katei)
2061+
case file_types::TY_SwiftModuleSummaryFile:
20632062
case file_types::TY_SwiftOverlayFile:
20642063
case file_types::TY_JSONDependencies:
20652064
// We could in theory handle assembly or LLVM input, but let's not.

‎lib/Driver/ToolChains.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -628,10 +628,9 @@ const char *ToolChain::JobContext::computeFrontendModeForCompile() const {
628628
case file_types::TY_BitstreamOptRecord:
629629
case file_types::TY_SwiftModuleInterfaceFile:
630630
case file_types::TY_PrivateSwiftModuleInterfaceFile:
631-
case file_types::TY_SwiftModuleSummaryFile:
632631
case file_types::TY_SwiftSourceInfoFile:
633632
case file_types::TY_SwiftCrossImportDir:
634-
case file_types::TY_SwiftModuleSummaryFile: // FIXME(katei)
633+
case file_types::TY_SwiftModuleSummaryFile:
635634
case file_types::TY_SwiftOverlayFile:
636635
llvm_unreachable("Output type can never be primary output.");
637636
case file_types::TY_INVALID:
@@ -890,7 +889,6 @@ ToolChain::constructInvocation(const BackendJobAction &job,
890889
case file_types::TY_BitstreamOptRecord:
891890
case file_types::TY_SwiftModuleInterfaceFile:
892891
case file_types::TY_PrivateSwiftModuleInterfaceFile:
893-
case file_types::TY_SwiftModuleSummaryFile:
894892
case file_types::TY_SwiftSourceInfoFile:
895893
case file_types::TY_SwiftCrossImportDir:
896894
case file_types::TY_SwiftModuleSummaryFile:

‎lib/SILOptimizer/IPO/DeadFunctionElimination.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class FunctionLivenessComputation {
403403
// Make sure that functions referenced by _specialize(target: targetFun())
404404
// are kept alive.
405405
F.forEachSpecializeAttrTargetFunction(
406-
[this](SILFunction *targetFun) { ensureAlive(targetFun); });
406+
[this](SILFunction *targetFun) { ensureAlive(targetFun, "forEachSpecializeAttrTargetFunction"); });
407407

408408
if (!F.shouldOptimize()) {
409409
LLVM_DEBUG(llvm::dbgs() << " anchor a no optimization function: "

‎lib/Serialization/DeserializeSIL.cpp‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -510,18 +510,17 @@ SILDeserializer::readSILFunctionChecked(DeclID FID, SILFunction *existingFn,
510510
IdentifierID replacedFunctionID;
511511
GenericSignatureID genericSigID;
512512
unsigned rawLinkage, isTransparent, isSerialized, isThunk,
513-
isWithoutactuallyEscapingThunk, isAsync, specialPurpose, inlineStrategy,
514-
optimizationMode, subclassScope, hasCReferences, effect, numSpecAttrs, hasQualifiedOwnership,
515-
isWeakImported, LIST_VER_TUPLE_PIECES(available),
513+
isWithoutactuallyEscapingThunk, specialPurpose, inlineStrategy,
514+
optimizationMode, subclassScope, hasCReferences, effect, numSpecAttrs,
515+
hasQualifiedOwnership, isWeakImported, LIST_VER_TUPLE_PIECES(available),
516516
isDynamic, isExactSelfClass;
517517
ArrayRef<uint64_t> SemanticsIDs;
518518
SILFunctionLayout::readRecord(
519519
scratch, rawLinkage, isTransparent, isSerialized, isThunk,
520-
isWithoutactuallyEscapingThunk, isAsync, specialPurpose, inlineStrategy,
521-
optimizationMode, subclassScope, hasCReferences, effect, numSpecAttrs, hasQualifiedOwnership,
522-
isWeakImported, LIST_VER_TUPLE_PIECES(available),
523-
isDynamic, isExactSelfClass,
524-
funcTyID, replacedFunctionID, genericSigID,
520+
isWithoutactuallyEscapingThunk, specialPurpose, inlineStrategy,
521+
optimizationMode, subclassScope, hasCReferences, effect, numSpecAttrs,
522+
hasQualifiedOwnership, isWeakImported, LIST_VER_TUPLE_PIECES(available),
523+
isDynamic, isExactSelfClass, funcTyID, replacedFunctionID, genericSigID,
525524
clangNodeOwnerID, SemanticsIDs);
526525

527526
if (funcTyID == 0) {
@@ -2861,18 +2860,17 @@ bool SILDeserializer::hasSILFunction(StringRef Name,
28612860
IdentifierID replacedFunctionID;
28622861
GenericSignatureID genericSigID;
28632862
unsigned rawLinkage, isTransparent, isSerialized, isThunk,
2864-
isWithoutactuallyEscapingThunk, isAsync, isGlobal, inlineStrategy,
2865-
optimizationMode, subclassScope, hasCReferences, effect, numSpecAttrs, hasQualifiedOwnership,
2866-
isWeakImported, LIST_VER_TUPLE_PIECES(available),
2863+
isWithoutactuallyEscapingThunk, isGlobal, inlineStrategy,
2864+
optimizationMode, subclassScope, hasCReferences, effect, numSpecAttrs,
2865+
hasQualifiedOwnership, isWeakImported, LIST_VER_TUPLE_PIECES(available),
28672866
isDynamic, isExactSelfClass;
28682867
ArrayRef<uint64_t> SemanticsIDs;
28692868
SILFunctionLayout::readRecord(
28702869
scratch, rawLinkage, isTransparent, isSerialized, isThunk,
2871-
isWithoutactuallyEscapingThunk, isAsync, isGlobal, inlineStrategy,
2872-
optimizationMode, subclassScope, hasCReferences, effect, numSpecAttrs, hasQualifiedOwnership,
2873-
isWeakImported, LIST_VER_TUPLE_PIECES(available),
2874-
isDynamic, isExactSelfClass,
2875-
funcTyID, replacedFunctionID, genericSigID,
2870+
isWithoutactuallyEscapingThunk, isGlobal, inlineStrategy,
2871+
optimizationMode, subclassScope, hasCReferences, effect, numSpecAttrs,
2872+
hasQualifiedOwnership, isWeakImported, LIST_VER_TUPLE_PIECES(available),
2873+
isDynamic, isExactSelfClass, funcTyID, replacedFunctionID, genericSigID,
28762874
clangOwnerID, SemanticsIDs);
28772875
auto linkage = fromStableSILLinkage(rawLinkage);
28782876
if (!linkage) {

‎lib/Serialization/ModuleSummaryIndexer.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void FunctionSummaryIndexer::indexDirectFunctionCall(
107107
if (!RecordedDirectTargets.insert(guid).second) {
108108
return;
109109
}
110-
FunctionSummary::Call call(guid, Callee.getName(),
110+
FunctionSummary::Call call(guid, Callee.getName().str(),
111111
FunctionSummary::Call::Direct);
112112
TheSummary->addCall(call);
113113
}
@@ -334,7 +334,7 @@ void FunctionSummaryIndexer::indexFunction() {
334334
GUID guid = getGUIDFromUniqueName(F.getName());
335335
uint32_t instSize = 0;
336336
TheSummary = std::make_unique<FunctionSummary>(guid);
337-
TheSummary->setName(F.getName());
337+
TheSummary->setName(F.getName().str());
338338
for (auto &BB : F) {
339339
for (auto &I : BB) {
340340
visit(&I);
@@ -456,7 +456,7 @@ void ModuleSummaryIndexer::indexVTable(const SILVTable &VT) {
456456
void ModuleSummaryIndexer::indexModule() {
457457
TheSummary = std::make_unique<ModuleSummaryIndex>();
458458
auto moduleName = Mod.getSwiftModule()->getName().str();
459-
TheSummary->setName(moduleName);
459+
TheSummary->setName(moduleName.str());
460460

461461
for (auto &F : Mod) {
462462
FunctionSummaryIndexer indexer(F);

‎lib/Serialization/SerializedModuleLoader.cpp‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,15 +1123,21 @@ void SerializedASTFile::collectLinkLibrariesFromImports(
11231123
ModuleDecl::LinkLibraryCallback callback) const {
11241124

11251125
llvm::SmallDenseSet<ModuleDecl *, 32> visited;
1126-
SmallVector<ModuleDecl::ImportedModule, 32> stack;
1127-
ModuleDecl::ImportFilter filter = {ModuleDecl::ImportFilterKind::Exported,
1128-
ModuleDecl::ImportFilterKind::Default};
1129-
File.getImportedModules(stack, filter);
1126+
SmallVector<ImportedModule, 32> stack;
1127+
1128+
ModuleDecl::ImportFilter filter = {
1129+
ModuleDecl::ImportFilterKind::Exported,
1130+
ModuleDecl::ImportFilterKind::Default,
1131+
ModuleDecl::ImportFilterKind::SPIAccessControl};
1132+
1133+
auto *topLevel = getParentModule();
1134+
1135+
ModuleDecl::ImportFilter topLevelFilter = filter;
1136+
topLevelFilter |= ModuleDecl::ImportFilterKind::ImplementationOnly;
1137+
topLevel->getImportedModules(stack, topLevelFilter);
11301138

11311139
// Make sure the top-level module is first; we want pre-order-ish traversal.
1132-
auto topLevelModule =
1133-
ModuleDecl::ImportedModule{ModuleDecl::AccessPathTy(), getParentModule()};
1134-
stack.emplace_back(topLevelModule);
1140+
stack.emplace_back(ImportPath::Access(), topLevel);
11351141

11361142
while (!stack.empty()) {
11371143
auto next = stack.pop_back_val().importedModule;

‎tools/swift-module-summary-test/swift-module-summary-test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,14 +441,14 @@ class RetainedSizeCalculator {
441441

442442
void calculateRecursively(DomCallInfoNode *domNode) {
443443
Entries.push_back({domNode, getInstSize(domNode)});
444-
for (auto child : domNode->getChildren()) {
444+
for (auto child : domNode->children()) {
445445
calculateRecursively(child);
446446
}
447447
}
448448

449449
public:
450450
void calculate(DomCallInfoNode *root) {
451-
for (auto child : root->getChildren()) {
451+
for (auto child : root->children()) {
452452
calculateRecursively(child);
453453
}
454454
std::sort(Entries.begin(), Entries.end(),
@@ -473,7 +473,7 @@ class RetainedSizeCalculator {
473473
O << "\t| ";
474474
O.indent(2 * Lev) << FS->getName() << "\n";
475475

476-
auto Children = Root->getChildren();
476+
auto Children = Root->children();
477477
std::sort(Children.begin(), Children.end(),
478478
[&](DomCallInfoNode *lhs, DomCallInfoNode *rhs) {
479479
return getInstSize(lhs) > getInstSize(rhs);
@@ -485,10 +485,10 @@ class RetainedSizeCalculator {
485485
void displayTree(llvm::raw_ostream &O, DomCallInfoNode *Root) {
486486
O << "size\t| %\t| symbol\n";
487487
uint32_t TotalSize = 0;
488-
for (auto Child : Root->getChildren()) {
488+
for (auto Child : Root->children()) {
489489
TotalSize += getInstSize(Child);
490490
}
491-
auto Children = Root->getChildren();
491+
auto Children = Root->children();
492492
std::sort(Children.begin(), Children.end(),
493493
[&](DomCallInfoNode *lhs, DomCallInfoNode *rhs) {
494494
return getInstSize(lhs) > getInstSize(rhs);

0 commit comments

Comments
 (0)