Skip to content

Commit e90272b

Browse files
ktosoktoso
authored
Merge pull request #74002 from ktoso/pick-wip-remove-comments
2 parents 94c077a + e56d83d commit e90272b

File tree

1 file changed

+0
-119
lines changed

1 file changed

+0
-119
lines changed

‎lib/Serialization/Serialization.cpp

Lines changed: 0 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,8 +1795,6 @@ void Serializer::writeLocalNormalProtocolConformance(
17951795
unsigned abbrCode
17961796
= DeclTypeAbbrCodes[NormalProtocolConformanceLayout::Code];
17971797
auto ownerID = addDeclContextRef(conformance->getDeclContext());
1798-
// fprintf(stderr, "[%s:%d](%s) NormalProtocolConformanceLayout::emitRecord >>>>>>>\n", __FILE_NAME__, __LINE__, __FUNCTION__);
1799-
// conformance->dump();
18001798
NormalProtocolConformanceLayout::emitRecord(Out, ScratchRecord, abbrCode,
18011799
addDeclRef(protocol),
18021800
ownerID.getOpaqueValue(),
@@ -1833,74 +1831,6 @@ Serializer::addConformanceRef(ProtocolConformanceRef ref) {
18331831

18341832
if (ref.isConcrete()) {
18351833
auto conformance = ref.getConcrete();
1836-
1837-
// NOTE:
1838-
// we come here from:
1839-
// frame #4: 0x00000001023df6a4 swift-frontend`swift::serialization::Serializer::addConformanceRef(this=0x000000016fdf3fd0, ref=ProtocolConformanceRef @ 0x000000016fdec640) at Serialization.cpp:1852:11
1840-
// frame #5: 0x00000001023e13fc swift-frontend`swift::serialization::Serializer::addConformanceRefs(this=0x000000016fdf3fd0, conformances=ArrayRef<swift::ProtocolConformanceRef> @ 0x000000016fdec6b0) at Serialization.cpp:1987:23
1841-
// frame #6: 0x000000010250c298 swift-frontend`(anonymous namespace)::SILSerializer::writeSILInstruction(this=0x000000016fdf3480, SI=0x00006000035768a0) at SerializeSIL.cpp:1023:29
1842-
// * frame #7: 0x0000000102533ec8 swift-frontend`(anonymous namespace)::SILSerializer::writeSILBasicBlock(this=0x000000016fdf3480, BB=0x000000015b25c348) at SerializeSIL.cpp:674:5
1843-
// frame #8: 0x0000000102503264 swift-frontend`(anonymous namespace)::SILSerializer::writeSILFunction(this=0x000000016fdf3480, F=0x000000015b25be50, DeclOnly=false) at SerializeSIL.cpp:621:5
1844-
// frame #9: 0x0000000102501398 swift-frontend`(anonymous namespace)::SILSerializer::processWorklists(this=0x000000016fdf3480) at SerializeSIL.cpp:402:7
1845-
// frame #10: 0x00000001024fd50c swift-frontend`(anonymous namespace)::SILSerializer::writeSILBlock(this=0x000000016fdf3480, SILMod=0x00000001588d3600) at SerializeSIL.cpp:3296:5
1846-
// frame #11: 0x00000001024fb04c swift-frontend`(anonymous namespace)::SILSerializer::writeSILModule(this=0x000000016fdf3480, SILMod=0x00000001588d3600) at SerializeSIL.cpp:3341:3
1847-
// frame #12: 0x00000001024faf98 swift-frontend`swift::serialization::Serializer::writeSIL(this=0x000000016fdf3fd0, SILMod=0x00000001588d3600, serializeAllSIL=false) at SerializeSIL.cpp:3350:10
1848-
// frame #13: 0x00000001023f02f4 swift-frontend`swift::serialization::Serializer::writeToStream(os=0x00000001386f2718, DC=swift::ModuleOrSourceFile @ 0x000000016fdf5a40, SILMod=0x00000001588d3600, options=0x000000016fdf60d8, DepGraph=0x0000000000000000) at Serialization.cpp:6912:7
1849-
// frame #14: 0x00000001023f09d4 swift-frontend`swift::serialization::writeToStream(os=0x00000001386f2718, DC=swift::ModuleOrSourceFile @ 0x000000016fdf5aa0, M=0x00000001588d3600, options=0x000000016fdf60d8, DepGraph=0x0000000000000000) at Serialization.cpp:6978:3
1850-
// frame #15: 0x0000000100ad4778 swift-frontend`swift::serialize(llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::SerializationOptions const&, swift::symbolgraphgen::SymbolGraphOptions const&, swift::SILModule const*, swift::fine_grained_dependencies::SourceFileDepGraph const*)::$_3::operator()(this=0x000000016fdf5f10, out=0x00000001386f2718) const at Serialization.cpp:151:9
1851-
// frame #16: 0x0000000100ad46c8 swift-frontend`bool llvm::function_ref<bool (llvm::raw_pwrite_stream&)>::callback_fn<swift::serialize(llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::SerializationOptions const&, swift::symbolgraphgen::SymbolGraphOptions const&, swift::SILModule const*, swift::fine_grained_dependencies::SourceFileDepGraph const*)::$_3>(callable=6171877136, params=0x00000001386f2718) at STLFunctionalExtras.h:45:12
1852-
// frame #17: 0x00000001000e2a38 swift-frontend`llvm::function_ref<bool (llvm::raw_pwrite_stream&)>::operator()(this=0x000000016fdf5d50, params=0x00000001386f2718) const at STLFunctionalExtras.h:68:12
1853-
// frame #18: 0x00000001000e1bfc swift-frontend`swift::withOutputPath(diags=0x0000000159042250, Backend=0x00006000006389e0, outputPath=(Data = "/Users/ktoso/code/swift-project/build/Ninja-DebugAssert/swift-macosx-arm64/test-macosx-arm64/Distributed/Runtime/Output/distributed_actor_to_actor.swift.tmp/FakeDistributedActorSystems.swiftmodule", Length = 196), action=function_ref<bool (llvm::raw_pwrite_stream &)> @ 0x000000016fdf5d50) at FileSystem.h:43:17
1854-
// frame #19: 0x0000000100ad3de4 swift-frontend`swift::serialize(DC=swift::ModuleOrSourceFile @ 0x000000016fdf5ff0, options=0x000000016fdf60d8, symbolGraphOptions=0x0000000159041398, M=0x00000001588d3600, DG=0x0000000000000000) at Serialization.cpp:146:19
1855-
// frame #20: 0x00000001003817bc swift-frontend`performCompileStepsPostSILGen(swift::CompilerInstance&, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule>>, llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::PrimarySpecificPaths const&, int&, swift::FrontendObserver*)::$_33::operator()(this=0x00006000011111c8) const at FrontendTool.cpp:1834:7
1856-
// frame #21: 0x0000000100381538 swift-frontend`decltype(std::declval<performCompileStepsPostSILGen(swift::CompilerInstance&, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule>>, llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::PrimarySpecificPaths const&, int&, swift::FrontendObserver*)::$_33&>()()) std::__1::__invoke[abi:v160006]<performCompileStepsPostSILGen(swift::CompilerInstance&, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule>>, llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::PrimarySpecificPaths const&, int&, swift::FrontendObserver*)::$_33&>(__f=0x00006000011111c8) at invoke.h:394:23
1857-
// frame #22: 0x00000001003814f0 swift-frontend`void std::__1::__invoke_void_return_wrapper<void, true>::__call<performCompileStepsPostSILGen(swift::CompilerInstance&, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule>>, llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::PrimarySpecificPaths const&, int&, swift::FrontendObserver*)::$_33&>(__args=0x00006000011111c8) at invoke.h:487:9
1858-
// frame #23: 0x00000001003814cc swift-frontend`std::__1::__function::__alloc_func<performCompileStepsPostSILGen(swift::CompilerInstance&, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule>>, llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::PrimarySpecificPaths const&, int&, swift::FrontendObserver*)::$_33, std::__1::allocator<performCompileStepsPostSILGen(swift::CompilerInstance&, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule>>, llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::PrimarySpecificPaths const&, int&, swift::FrontendObserver*)::$_33>, void ()>::operator()[abi:v160006](this=0x00006000011111c8) at function.h:185:16
1859-
// frame #24: 0x00000001003805a4 swift-frontend`std::__1::__function::__func<performCompileStepsPostSILGen(swift::CompilerInstance&, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule>>, llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::PrimarySpecificPaths const&, int&, swift::FrontendObserver*)::$_33, std::__1::allocator<performCompileStepsPostSILGen(swift::CompilerInstance&, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule>>, llvm::PointerUnion<swift::ModuleDecl*, swift::SourceFile*>, swift::PrimarySpecificPaths const&, int&, swift::FrontendObserver*)::$_33>, void ()>::operator()(this=0x00006000011111c0) at function.h:356:12
1860-
// frame #25: 0x00000001004124d4 swift-frontend`std::__1::__function::__value_func<void ()>::operator()[abi:v160006](this=0x00000001588d3a00) const at function.h:510:16
1861-
// frame #26: 0x0000000100412484 swift-frontend`std::__1::function<void ()>::operator()(this=0x00000001588d3a00) const at function.h:1156:12
1862-
// frame #27: 0x0000000102684a78 swift-frontend`swift::SILModule::serialize(this=0x00000001588d3600) at SILModule.cpp:854:3
1863-
// frame #28: 0x0000000101eefcc4 swift-frontend`SerializeSILPass::run(this=0x0000600000a7fcf0) at SerializeSILPass.cpp:533:7
1864-
// frame #29: 0x0000000101c0a038 swift-frontend`swift::SILPassManager::runModulePass(this=0x000000016fdf67d8, TransIdx=0) at PassManager.cpp:883:8
1865-
// frame #30: 0x0000000101c0d6a4 swift-frontend`swift::SILPassManager::execute(this=0x000000016fdf67d8) at PassManager.cpp:988:7
1866-
// frame #31: 0x0000000101c06658 swift-frontend`swift::SILPassManager::executePassPipelinePlan(this=0x000000016fdf67d8, Plan=0x000000016fdf7460) at PassManager.cpp:953:5
1867-
// frame #32: 0x0000000101c0644c swift-frontend`swift::ExecuteSILPipelineRequest::evaluate(this=0x000000016fdf73d8, evaluator=0x000000015901e878, desc=SILPipelineExecutionDescriptor @ 0x000000016fdf7210) const at PassManager.cpp:398:6
1868-
// frame #33: 0x0000000101c77e48 swift-frontend`std::__1::tuple<> swift::SimpleRequest<swift::ExecuteSILPipelineRequest, std::__1::tuple<> (swift::SILPipelineExecutionDescriptor), (swift::RequestFlags)1>::callDerived<0ul>(this=0x000000016fdf73d8, evaluator=0x000000015901e878, (null)=std::__1::index_sequence<0UL> @ 0x000000016fdf724f) const at SimpleRequest.h:272:24
1869-
// frame #34: 0x0000000101c77dac swift-frontend`swift::SimpleRequest<swift::ExecuteSILPipelineRequest, std::__1::tuple<> (swift::SILPipelineExecutionDescriptor), (swift::RequestFlags)1>::evaluateRequest(request=0x000000016fdf73d8, evaluator=0x000000015901e878) at SimpleRequest.h:295:20
1870-
// frame #35: 0x0000000101c3c310 swift-frontend`swift::ExecuteSILPipelineRequest::OutputType swift::Evaluator::getResultUncached<swift::ExecuteSILPipelineRequest, swift::ExecuteSILPipelineRequest::OutputType swift::evaluateOrFatal<swift::ExecuteSILPipelineRequest>(swift::Evaluator&, swift::ExecuteSILPipelineRequest)::'lambda'()>(this=0x000000015901e878, request=0x000000016fdf73d8, defaultValueFn=(unnamed class) @ 0x000000016fdf7336) at Evaluator.h:322:19
1871-
// frame #36: 0x0000000101c3c238 swift-frontend`swift::ExecuteSILPipelineRequest::OutputType swift::Evaluator::operator()<swift::ExecuteSILPipelineRequest, swift::ExecuteSILPipelineRequest::OutputType swift::evaluateOrFatal<swift::ExecuteSILPipelineRequest>(swift::Evaluator&, swift::ExecuteSILPipelineRequest)::'lambda'(), (void*)0>(this=0x000000015901e878, request=0x000000016fdf73d8, defaultValueFn=(unnamed class) @ 0x000000016fdf737f) at Evaluator.h:237:12
1872-
// frame #37: 0x0000000101c0674c swift-frontend`swift::ExecuteSILPipelineRequest::OutputType swift::evaluateOrFatal<swift::ExecuteSILPipelineRequest>(eval=0x000000015901e878, req=ExecuteSILPipelineRequest @ 0x000000016fdf73d8) at Evaluator.h:423:10
1873-
// frame #38: 0x0000000101c06720 swift-frontend`swift::executePassPipelinePlan(SM=0x00000001588d3600, plan=0x000000016fdf7460, isMandatory=true, IRMod=0x0000000000000000) at PassManager.cpp:408:9
1874-
// frame #39: 0x0000000101c5c04c swift-frontend`swift::runSILPassesForOnone(Module=0x00000001588d3600) at Passes.cpp:152:3
1875-
// frame #40: 0x0000000100a5ae3c swift-frontend`performSILOptimizations(Invocation=0x0000000159040800, SM=0x00000001588d3600) at Frontend.cpp:1723:5
1876-
// frame #41: 0x0000000100a5ac68 swift-frontend`swift::CompilerInstance::performSILProcessing(this=0x0000000159040800, silModule=0x00000001588d3600) at Frontend.cpp:1765:3
1877-
// frame #42: 0x0000000100377aec swift-frontend`performCompileStepsPostSILGen(Instance=0x0000000159040800, SM=swift::SILModule @ 0x00000001588d3600, MSF=swift::ModuleOrSourceFile @ 0x000000016fdf7940, PSPs=0x000000016fdf7fb8, ReturnValue=0x000000016fdf92fc, observer=0x0000000000000000) at FrontendTool.cpp:1843:16
1878-
// frame #43: 0x000000010037726c swift-frontend`swift::performCompileStepsPostSema(Instance=0x0000000159040800, ReturnValue=0x000000016fdf92fc, observer=0x0000000000000000) at FrontendTool.cpp:886:12
1879-
// frame #44: 0x00000001003a73f0 swift-frontend`performAction(swift::CompilerInstance&, int&, swift::FrontendObserver*)::$_29::operator()(this=0x000000016fdf8d20, Instance=0x0000000159040800) const at FrontendTool.cpp:1451:18
1880-
// frame #45: 0x00000001003a7354 swift-frontend`bool llvm::function_ref<bool (swift::CompilerInstance&)>::callback_fn<performAction(swift::CompilerInstance&, int&, swift::FrontendObserver*)::$_29>(callable=6171888928, params=0x0000000159040800) at STLFunctionalExtras.h:45:12
1881-
// frame #46: 0x00000001003a6704 swift-frontend`llvm::function_ref<bool (swift::CompilerInstance&)>::operator()(this=0x000000016fdf8c58, params=0x0000000159040800) const at STLFunctionalExtras.h:68:12
1882-
// frame #47: 0x00000001003a55c4 swift-frontend`withSemanticAnalysis(Instance=0x0000000159040800, observer=0x0000000000000000, cont=function_ref<bool (swift::CompilerInstance &)> @ 0x000000016fdf8c58, runDespiteErrors=false) at FrontendTool.cpp:1311:10
1883-
// frame #48: 0x00000001003a01cc swift-frontend`performAction(Instance=0x0000000159040800, ReturnValue=0x000000016fdf92fc, observer=0x0000000000000000) at FrontendTool.cpp:1447:12
1884-
// frame #49: 0x0000000100379fac swift-frontend`performCompile(Instance=0x0000000159040800, ReturnValue=0x000000016fdf92fc, observer=0x0000000000000000) at FrontendTool.cpp:1522:19
1885-
1886-
// if (conformance->getKind() == ProtocolConformanceKind::Specialized) {
1887-
// if (auto specialized = dyn_cast<SpecializedProtocolConformance>(conformance)) {
1888-
// bool isConformanceOfProtocol =
1889-
// specialized->getDeclContext()->getSelfProtocolDecl() != nullptr;
1890-
// if (isConformanceOfProtocol) {
1891-
// fprintf(stderr, "[%s:%d](%s) SPECIALIZED\n", __FILE_NAME__, __LINE__, __FUNCTION__);
1892-
// fprintf(stderr, "[%s:%d](%s) SKIP IT? %d\n", __FILE_NAME__, __LINE__, __FUNCTION__,
1893-
// isConformanceOfProtocol);
1894-
// conformance->dump();
1895-
// if (auto p = specialized->getDeclContext()->getSelfProtocolDecl()) {
1896-
// fprintf(stderr, "[%s:%d](%s) proto = \n", __FILE_NAME__, __LINE__, __FUNCTION__);
1897-
// p->dump();
1898-
// }
1899-
// return 99999999;
1900-
// }
1901-
// }
1902-
// }
1903-
19041834
auto rawID = ConformancesToSerialize.addRef(conformance);
19051835
return ((rawID << SerializedProtocolConformanceKind::Shift) |
19061836
SerializedProtocolConformanceKind::Concrete);
@@ -1925,17 +1855,7 @@ Serializer::writeASTBlockEntity(ProtocolConformance *conformance) {
19251855
if (!isDeclXRef(normal->getDeclContext()->getAsDecl())
19261856
&& !isa<ClangModuleUnit>(normal->getDeclContext()
19271857
->getModuleScopeContext())) {
1928-
// TODO: would like to avoid writing the DA-A conformance but it never comes in here
1929-
// - an idea here was to add some "is serializable" to the protocol conformance, but that doesn't matter it seems
1930-
// since we never get to here anyway
1931-
// if (!normal->isConformanceOfProtocol()) {
1932-
// fprintf(stderr, "[%s:%d](%s) DONT SKIP\n", __FILE_NAME__, __LINE__, __FUNCTION__);
1933-
// normal->dump();
19341858
writeLocalNormalProtocolConformance(normal);
1935-
// } else {
1936-
// fprintf(stderr, "[%s:%d](%s) SKIP SERIALIZING\n", __FILE_NAME__, __LINE__, __FUNCTION__);
1937-
// normal->dump();
1938-
// }
19391859
} else {
19401860
// A conformance in a different module file.
19411861
unsigned abbrCode = DeclTypeAbbrCodes[ProtocolConformanceXrefLayout::Code];
@@ -2029,13 +1949,7 @@ Serializer::addConformanceRefs(ArrayRef<ProtocolConformanceRef> conformances) {
20291949

20301950
SmallVector<ProtocolConformanceID, 4> results;
20311951
for (auto conformance : conformances) {
2032-
// fprintf(stderr, "[%s:%d](%s) add conformance ref -----------\n", __FILE_NAME__, __LINE__, __FUNCTION__);
2033-
// conformance.dump();
2034-
// fprintf(stderr, "[%s:%d](%s) add conformance ref -----------\n", __FILE_NAME__, __LINE__, __FUNCTION__);
2035-
2036-
20371952
auto id = addConformanceRef(conformance);
2038-
// if (id != 99999999) // FIXME: horrible hack
20391953
results.push_back(id);
20401954
}
20411955
return results;
@@ -2048,28 +1962,6 @@ Serializer::addConformanceRefs(ArrayRef<ProtocolConformance*> conformances) {
20481962

20491963
SmallVector<ProtocolConformanceID, 4> results;
20501964
for (auto conformance : conformances) {
2051-
// fprintf(stderr, "[%s:%d](%s) add conformance ref -----------\n", __FILE_NAME__, __LINE__, __FUNCTION__);
2052-
// conformance->dump();
2053-
// fprintf(stderr, "[%s:%d](%s) add conformance ref -----------\n", __FILE_NAME__, __LINE__, __FUNCTION__);
2054-
//
2055-
//
2056-
// if (conformance->getKind() == ProtocolConformanceKind::Normal) {
2057-
// auto normal = cast<NormalProtocolConformance>(conformance);
2058-
// if (normal->isConformanceOfProtocol()) {
2059-
// normal->dump();
2060-
// fprintf(stderr, "[%s:%d](%s) SKIP DURING ADD SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP\n", __FILE_NAME__, __LINE__, __FUNCTION__);
2061-
// continue;
2062-
// }
2063-
// } else if (conformance->getKind() == ProtocolConformanceKind::Specialized) {
2064-
// fprintf(stderr, "[%s:%d](%s) SPECIALIZED\n", __FILE_NAME__, __LINE__, __FUNCTION__);
2065-
// auto specialized = cast<SpecializedProtocolConformance>(conformance);
2066-
// specialized->dump();
2067-
// if (specialized->getDeclContext()->getSelfProtocolDecl() != nullptr) {
2068-
// fprintf(stderr, "[%s:%d](%s) SKIP DURING ADD SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP\n", __FILE_NAME__, __LINE__, __FUNCTION__);
2069-
// continue;
2070-
// }
2071-
// }
2072-
20731965
results.push_back(addConformanceRef(conformance));
20741966
}
20751967
return results;
@@ -3489,17 +3381,6 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
34893381
SmallVectorImpl<TypeID> &data) {
34903382
size_t count = 0;
34913383
for (auto conformance : declContext->getLocalConformances(lookupKind)) {
3492-
// fprintf(stderr, "[%s:%d](%s) ADD CONFOMANCE CHECK IF SKIP\n", __FILE_NAME__, __LINE__, __FUNCTION__);
3493-
// conformance->dump();
3494-
3495-
// if (conformance->getKind() == ProtocolConformanceKind::Normal) {
3496-
// auto normal = cast<NormalProtocolConformance>(conformance);
3497-
// if (normal->isConformanceOfProtocol()) {
3498-
// fprintf(stderr, "[%s:%d](%s) SKIP IP SKIP IP SKIP IP SKIP IP SKIP IP !!!!\n", __FILE_NAME__, __LINE__, __FUNCTION__);
3499-
// continue;
3500-
// }
3501-
// }
3502-
35033384
if (S.shouldSkipDecl(conformance->getProtocol()))
35043385
continue;
35053386

0 commit comments

Comments
 (0)