Merge pull request swiftlang#27897 from apple/remove-todo-wip

compnerd · web-flow · commit 3ced35855e69 · 2019-10-26T13:49:06.000-07:00
remove todo warnings, oops
diff --git a/lib/AST/ASTDemangler.cpp b/lib/AST/ASTDemangler.cpp
@@ -505,7 +505,6 @@ Type ASTBuilder::createImplFunctionType(
     auto conv = getResultConvention(errorResult->getConvention());
     funcErrorResult.emplace(type, conv);
   }
-#warning "todo: demangle substituted silfunctiontype fields"
   return SILFunctionType::get(genericSig, einfo, funcCoroutineKind,
                               funcCalleeConvention, funcParams, funcYields,
                               funcResults, funcErrorResult,
diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
@@ -357,7 +357,6 @@ std::string ASTMangler::mangleReabstractionThunkHelper(
                                             Type SelfType,
                                             ModuleDecl *Module) {
   Mod = Module;
-#warning "todo: mangle substituted types"
   assert(ThunkType->getSubstitutions().empty() && "not implemented");
   GenericSignature GenSig = ThunkType->getSubstGenericSignature();
   if (GenSig)
@@ -1425,7 +1424,6 @@ static char getResultConvention(ResultConvention conv) {
 };
 
 void ASTMangler::appendImplFunctionType(SILFunctionType *fn) {
-#warning "todo: handle substituted types"
 
   llvm::SmallVector<char, 32> OpArgs;
 
diff --git a/lib/SIL/SILBuilder.cpp b/lib/SIL/SILBuilder.cpp
@@ -54,7 +54,6 @@ SILType SILBuilder::getPartialApplyResultType(SILType origTy, unsigned argCount,
                                         SubstitutionMap subs,
                                         ParameterConvention calleeConvention,
                                         PartialApplyInst::OnStackKind onStack) {
-#warning "todo: preserve substitution through partial apply?"
   CanSILFunctionType FTI = origTy.castTo<SILFunctionType>();
   if (!subs.empty())
     FTI = FTI->substGenericArgs(M, subs);
diff --git a/lib/SIL/SILFunction.cpp b/lib/SIL/SILFunction.cpp
@@ -44,7 +44,6 @@ SILSpecializeAttr *SILSpecializeAttr::create(SILModule &M,
 }
 
 void SILFunction::addSpecializeAttr(SILSpecializeAttr *Attr) {
-#warning "todo: base on decl type params?"
   if (getLoweredFunctionType()->getInvocationGenericSignature()) {
     Attr->F = this;
     SpecializeAttrSet.push_back(Attr);
diff --git a/lib/SIL/SILFunctionType.cpp b/lib/SIL/SILFunctionType.cpp
@@ -1059,7 +1059,6 @@ static CanSILFunctionType getSILFunctionType(
     .withIsPseudogeneric(pseudogeneric)
     .withNoEscape(extInfo.isNoEscape());
   
-#warning "todo: substituted function types?"
   
   return SILFunctionType::get(genericSig, silExtInfo, coroutineKind,
                               calleeConvention, inputs, yields,
@@ -2588,7 +2587,6 @@ SILFunctionType::substGenericArgs(SILModule &silModule,
                                   TypeSubstitutionFn subs,
                                   LookupConformanceFn conformances) {
   if (!isPolymorphic()) return CanSILFunctionType(this);
-#warning "todo: should produce a substituted function type"
   SILTypeSubstituter substituter(silModule.Types, subs, conformances,
                                  getSubstGenericSignature(),
                                  /*shouldSubstituteOpaqueTypes*/ false);
diff --git a/lib/SILGen/SILGen.cpp b/lib/SILGen/SILGen.cpp
@@ -418,7 +418,6 @@ SILGenModule::getKeyPathProjectionCoroutine(bool isReadAccess,
                              /*pseudogeneric*/false,
                              /*non-escaping*/false);
 
-#warning "todo: should be a substituted function type of the common key path interface"
   auto functionTy = SILFunctionType::get(sig, extInfo,
                                          SILCoroutineKind::YieldOnce,
                                          ParameterConvention::Direct_Unowned,
diff --git a/lib/SILGen/SILGenBridging.cpp b/lib/SILGen/SILGenBridging.cpp
@@ -201,7 +201,6 @@ emitBridgeObjectiveCToNative(SILGenFunction &SGF,
   auto witnessFnTy = witnessRef->getType().castTo<SILFunctionType>();
 
   CanType swiftValueType = conformance->getType()->getCanonicalType();
-#warning "todo: preserve substituted type?"
   auto genericSig = witnessFnTy->getInvocationGenericSignature();
   SubstitutionMap typeSubMap = witness.getSubstitutions();
 
@@ -549,7 +548,6 @@ ManagedValue SILGenFunction::emitFuncToBlock(SILLocation loc,
   GenericEnvironment *genericEnv = nullptr;
   SubstitutionMap subs;
   if (funcType->hasArchetype() || blockType->hasArchetype()) {
-#warning "todo: preserve substitution?"
     genericSig = F.getLoweredFunctionType()->getInvocationGenericSignature();
     genericEnv = F.getGenericEnvironment();
 
diff --git a/lib/SILGen/SILGenExpr.cpp b/lib/SILGen/SILGenExpr.cpp
@@ -2666,7 +2666,6 @@ static SILFunction *getOrCreateKeyPathGetter(SILGenModule &SGM,
   
   SILResultInfo result(loweredPropTy, ResultConvention::Indirect);
   
-#warning "todo: should be a substituted function type of the common key path interface type"
   auto signature = SILFunctionType::get(genericSig,
     SILFunctionType::ExtInfo(SILFunctionType::Representation::Thin,
                              /*pseudogeneric*/ false,
diff --git a/lib/SILGen/SILGenPoly.cpp b/lib/SILGen/SILGenPoly.cpp
@@ -103,7 +103,6 @@
 using namespace swift;
 using namespace Lowering;
 
-#warning "todo: handle substitutions throughout this file--audit CanSILFunctionType() and getInterfaceType() calls"
 
 /// A helper function that pulls an element off the front of an array.
 template <class T>
diff --git a/lib/SILOptimizer/FunctionSignatureTransforms/FunctionSignatureOpts.cpp b/lib/SILOptimizer/FunctionSignatureTransforms/FunctionSignatureOpts.cpp
@@ -203,7 +203,6 @@ FunctionSignatureTransformDescriptor::createOptimizedSILFunctionName() {
 static bool usesGenerics(SILFunction *F,
                          ArrayRef<SILParameterInfo> InterfaceParams,
                          ArrayRef<SILResultInfo> InterfaceResults) {
-#warning "todo: rework for subst function types and silfunction generic sigs"
   CanSILFunctionType FTy = F->getLoweredFunctionType();
   auto HasGenericSignature = FTy->getSubstGenericSignature() != nullptr;
   if (!HasGenericSignature)
diff --git a/lib/SILOptimizer/IPO/CapturePropagation.cpp b/lib/SILOptimizer/IPO/CapturePropagation.cpp
@@ -255,7 +255,6 @@ SILFunction *CapturePropagation::specializeConstClosure(PartialApplyInst *PAI,
   auto NewFTy = getPartialApplyInterfaceResultType(PAI);
   NewFTy = NewFTy->getWithRepresentation(SILFunctionType::Representation::Thin);
 
-#warning "todo: preserve substituted type"
   GenericEnvironment *GenericEnv = nullptr;
   if (NewFTy->getInvocationGenericSignature())
     GenericEnv = OrigF->getGenericEnvironment();
diff --git a/lib/SILOptimizer/Utils/Generics.cpp b/lib/SILOptimizer/Utils/Generics.cpp
@@ -150,7 +150,6 @@ static std::pair<unsigned, unsigned> getTypeDepthAndWidth(Type t) {
         MaxTypeDepth = TypeDepth;
       Width += TypeWidth;
     }
-#warning "todo: include substitution replacement types?"
     Depth += MaxTypeDepth;
     return std::make_pair(Depth, Width);
   }
@@ -771,7 +770,6 @@ ReabstractionInfo::createSubstitutedType(SILFunction *OrigF,
   }
   assert(FnTy);
 
-#warning "todo: eliminate substituted function types"
   // Use the new specialized generic signature.
   auto NewFnTy = SILFunctionType::get(
       CanSpecializedGenericSig, FnTy->getExtInfo(),
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -2610,7 +2610,6 @@ Type TypeResolver::resolveSILFunctionType(FunctionTypeRepr *repr,
                                           SILFunctionType::ExtInfo extInfo,
                                           ParameterConvention callee,
                                           TypeRepr *witnessMethodProtocol) {
-#warning "todo: type resolution for subst function types"
   options.setContext(None);
 
   bool hasError = false;
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
@@ -5044,7 +5044,6 @@ class swift::TypeDeserializer {
     }
 
     GenericSignature genericSig = MF.getGenericSignature(rawGenericSig);
-#warning "todo: serialize/deserialize subst function types"
     return SILFunctionType::get(genericSig, extInfo, coroutineKind.getValue(),
                                 calleeConvention.getValue(),
                                 allParams, allYields, allResults,
diff --git a/lib/Serialization/Serialization.cpp b/lib/Serialization/Serialization.cpp
@@ -3941,7 +3941,6 @@ class Serializer::TypeSerializer : public TypeVisitor<TypeSerializer> {
     auto stableRepresentation =
       getRawStableSILFunctionTypeRepresentation(representation);
 
-#warning "todo: serialize subst types"
     SmallVector<TypeID, 8> variableData;
     for (auto param : fnTy->getParameters()) {
       variableData.push_back(S.addTypeRef(param.getInterfaceType()));

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,6 @@ Type ASTBuilder::createImplFunctionType(`
`505`	`505`	`auto conv = getResultConvention(errorResult->getConvention());`
`506`	`506`	`funcErrorResult.emplace(type, conv);`
`507`	`507`	`}`
`508`		`-#warning "todo: demangle substituted silfunctiontype fields"`
`509`	`508`	`return SILFunctionType::get(genericSig, einfo, funcCoroutineKind,`
`510`	`509`	`funcCalleeConvention, funcParams, funcYields,`
`511`	`510`	`funcResults, funcErrorResult,`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ SILSpecializeAttr *SILSpecializeAttr::create(SILModule &M,`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`void SILFunction::addSpecializeAttr(SILSpecializeAttr *Attr) {`
`47`		`-#warning "todo: base on decl type params?"`
`48`	`47`	`if (getLoweredFunctionType()->getInvocationGenericSignature()) {`
`49`	`48`	`Attr->F = this;`
`50`	`49`	`SpecializeAttrSet.push_back(Attr);`