Merge pull request #3453 from swiftwasm/release/5.5

MaxDesiatov · web-flow · commit be95bf6cd699 · 2021-09-02T15:26:27.000+01:00
[pull] swiftwasm-release/5.5 from release/5.5
diff --git a/lib/AST/Parameter.cpp b/lib/AST/Parameter.cpp
@@ -60,8 +60,7 @@ ParameterList *ParameterList::clone(const ASTContext &C,
 
   // Remap the ParamDecls inside of the ParameterList.
   for (auto &decl : params) {
-    bool hadDefaultArgument =
-        decl->getDefaultArgumentKind() == DefaultArgumentKind::Normal;
+    auto defaultArgKind = decl->getDefaultArgumentKind();
 
     decl = ParamDecl::cloneWithoutType(C, decl);
     if (options & Implicit)
@@ -74,11 +73,18 @@ ParameterList *ParameterList::clone(const ASTContext &C,
     
     // If we're inheriting a default argument, mark it as such.
     // FIXME: Figure out how to clone default arguments as well.
-    if (hadDefaultArgument) {
-      if (options & Inherited)
+    if (options & Inherited) {
+      switch (defaultArgKind) {
+      case DefaultArgumentKind::Normal:
+      case DefaultArgumentKind::StoredProperty:
         decl->setDefaultArgumentKind(DefaultArgumentKind::Inherited);
-      else
-        decl->setDefaultArgumentKind(DefaultArgumentKind::None);
+        break;
+
+      default:
+        break;
+      }
+    } else {
+      decl->setDefaultArgumentKind(DefaultArgumentKind::None);
     }
   }
   
diff --git a/lib/SILGen/SILGen.cpp b/lib/SILGen/SILGen.cpp
@@ -1299,8 +1299,8 @@ emitMarkFunctionEscapeForTopLevelCodeGlobals(SILLocation loc,
 }
 
 void SILGenModule::emitAbstractFuncDecl(AbstractFunctionDecl *AFD) {
-  // Emit any default argument generators.
-  emitDefaultArgGenerators(AFD, AFD->getParameters());
+  // Emit default arguments and property wrapper initializers.
+  emitArgumentGenerators(AFD, AFD->getParameters());
 
   // If this is a function at global scope, it may close over a global variable.
   // If we're emitting top-level code, then emit a "mark_function_escape" that
@@ -1389,6 +1389,9 @@ SILFunction *SILGenModule::emitClosure(AbstractClosureExpr *ce) {
   if (!f->isExternalDeclaration())
     return f;
 
+  // Emit property wrapper argument generators.
+  emitArgumentGenerators(ce, ce->getParameters());
+
   emitFunctionDefinition(constant, f);
   return f;
 }
@@ -1587,13 +1590,17 @@ void SILGenModule::emitGlobalAccessor(VarDecl *global,
   emitOrDelayFunction(*this, accessor);
 }
 
-void SILGenModule::emitDefaultArgGenerators(SILDeclRef::Loc decl,
-                                            ParameterList *paramList) {
+void SILGenModule::emitArgumentGenerators(SILDeclRef::Loc decl,
+                                          ParameterList *paramList) {
   unsigned index = 0;
   for (auto param : *paramList) {
     if (param->isDefaultArgument())
       emitDefaultArgGenerator(SILDeclRef::getDefaultArgGenerator(decl, index),
                               param);
+
+    if (param->hasExternalPropertyWrapper())
+      emitPropertyWrapperBackingInitializer(param);
+
     ++index;
   }
 }
diff --git a/lib/SILGen/SILGen.h b/lib/SILGen/SILGen.h
@@ -321,9 +321,9 @@ class LLVM_LIBRARY_VISIBILITY SILGenModule : public ASTVisitor<SILGenModule> {
   /// Emits the backing initializer for a property with an attached wrapper.
   void emitPropertyWrapperBackingInitializer(VarDecl *var);
 
-  /// Emits default argument generators for the given parameter list.
-  void emitDefaultArgGenerators(SILDeclRef::Loc decl,
-                                ParameterList *paramList);
+  /// Emits argument generators, including default argument generators and
+  /// property wrapper argument generators, for the given parameter list.
+  void emitArgumentGenerators(SILDeclRef::Loc decl, ParameterList *paramList);
   
   /// Emits a thunk from a foreign function to the native Swift convention.
   void emitForeignToNativeThunk(SILDeclRef thunk);
diff --git a/lib/SILGen/SILGenFunction.cpp b/lib/SILGen/SILGenFunction.cpp
@@ -517,23 +517,6 @@ void SILGenFunction::emitFunction(FuncDecl *fd) {
       // original asyncHandler.
       !F.isAsync()) {
     emitAsyncHandler(fd);
-  } else if (llvm::any_of(*fd->getParameters(),
-                          [](ParamDecl *p){ return p->hasAttachedPropertyWrapper(); })) {
-    // If any parameters have property wrappers, emit the local auxiliary
-    // variables before emitting the function body.
-    LexicalScope BraceScope(*this, CleanupLocation(fd));
-    for (auto *param : *fd->getParameters()) {
-      param->visitAuxiliaryDecls([&](VarDecl *auxiliaryVar) {
-        SILLocation WrapperLoc(auxiliaryVar);
-        WrapperLoc.markAsPrologue();
-        if (auto *patternBinding = auxiliaryVar->getParentPatternBinding())
-          visitPatternBindingDecl(patternBinding);
-
-        visit(auxiliaryVar);
-      });
-    }
-
-    emitStmt(fd->getTypecheckedBody());
   } else {
     emitStmt(fd->getTypecheckedBody());
   }
@@ -606,11 +589,6 @@ void SILGenFunction::emitClosure(AbstractClosureExpr *ace) {
   emitProlog(captureInfo, ace->getParameters(), /*selfParam=*/nullptr,
              ace, resultIfaceTy, ace->isBodyThrowing(), ace->getLoc());
   prepareEpilog(true, ace->isBodyThrowing(), CleanupLocation(ace));
-  for (auto *param : *ace->getParameters()) {
-    param->visitAuxiliaryDecls([&](VarDecl *auxiliaryVar) {
-      visit(auxiliaryVar);
-    });
-  }
 
   if (auto *ce = dyn_cast<ClosureExpr>(ace)) {
     emitStmt(ce->getBody());
diff --git a/lib/SILGen/SILGenFunction.h b/lib/SILGen/SILGenFunction.h
@@ -376,6 +376,10 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   /// a local variable.
   llvm::DenseMap<ValueDecl*, VarLoc> VarLocs;
 
+  /// The local auxiliary declarations for the parameters of this function that
+  /// need to be emitted inside the next brace statement.
+  llvm::SmallVector<VarDecl *, 2> LocalAuxiliaryDecls;
+
   // Context information for tracking an `async let` child task.
   struct AsyncLetChildTask {
     SILValue asyncLet; // RawPointer to the async let state
diff --git a/lib/SILGen/SILGenProlog.cpp b/lib/SILGen/SILGenProlog.cpp
@@ -244,12 +244,11 @@ struct ArgumentInitHelper {
   }
 
   void emitParam(ParamDecl *PD) {
-    if (PD->hasExternalPropertyWrapper()) {
-      auto initInfo = PD->getPropertyWrapperInitializerInfo();
-      if (initInfo.hasSynthesizedInitializers()) {
-        SGF.SGM.emitPropertyWrapperBackingInitializer(PD);
-      }
+    PD->visitAuxiliaryDecls([&](VarDecl *localVar) {
+      SGF.LocalAuxiliaryDecls.push_back(localVar);
+    });
 
+    if (PD->hasExternalPropertyWrapper()) {
       PD = cast<ParamDecl>(PD->getPropertyWrapperBackingProperty());
     }
 
@@ -307,6 +306,10 @@ static void makeArgument(Type ty, ParamDecl *decl,
 
 void SILGenFunction::bindParameterForForwarding(ParamDecl *param,
                                      SmallVectorImpl<SILValue> &parameters) {
+  if (param->hasExternalPropertyWrapper()) {
+    param = cast<ParamDecl>(param->getPropertyWrapperBackingProperty());
+  }
+
   makeArgument(param->getType(), param, parameters, *this);
 }
 
diff --git a/lib/SILGen/SILGenStmt.cpp b/lib/SILGen/SILGenStmt.cpp
@@ -282,7 +282,19 @@ void StmtEmitter::visitBraceStmt(BraceStmt *S) {
   const unsigned ThrowStmtType    = 3;
   const unsigned UnknownStmtType  = 4;
   unsigned StmtType = UnknownStmtType;
-  
+
+  // Emit local auxiliary declarations.
+  if (!SGF.LocalAuxiliaryDecls.empty()) {
+    for (auto *var : SGF.LocalAuxiliaryDecls) {
+      if (auto *patternBinding = var->getParentPatternBinding())
+        SGF.visit(patternBinding);
+
+      SGF.visit(var);
+    }
+
+    SGF.LocalAuxiliaryDecls.clear();
+  }
+
   for (auto &ESD : S->getElements()) {
     
     if (auto D = ESD.dyn_cast<Decl*>())
diff --git a/lib/SILGen/SILGenType.cpp b/lib/SILGen/SILGenType.cpp
@@ -1106,7 +1106,7 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {
       return;
 
     // Emit any default argument generators.
-    SGM.emitDefaultArgGenerators(EED, EED->getParameterList());
+    SGM.emitArgumentGenerators(EED, EED->getParameterList());
   }
 
   void visitPatternBindingDecl(PatternBindingDecl *pd) {
@@ -1141,7 +1141,7 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {
   }
 
   void visitSubscriptDecl(SubscriptDecl *sd) {
-    SGM.emitDefaultArgGenerators(sd, sd->getIndices());
+    SGM.emitArgumentGenerators(sd, sd->getIndices());
     visitAbstractStorageDecl(sd);
   }
 
@@ -1268,7 +1268,7 @@ class SILGenExtension : public TypeMemberVisitor<SILGenExtension> {
   }
 
   void visitSubscriptDecl(SubscriptDecl *sd) {
-    SGM.emitDefaultArgGenerators(sd, sd->getIndices());
+    SGM.emitArgumentGenerators(sd, sd->getIndices());
     visitAbstractStorageDecl(sd);
   }
 
diff --git a/test/SILGen/default_arguments.swift b/test/SILGen/default_arguments.swift
@@ -434,6 +434,23 @@ func testCallableWithDefault(_ x: CallableWithDefault) {
   x(y: 5)
 }
 
+enum E {
+  // CHECK-LABEL: sil hidden [ossa] @$s17default_arguments1EO6ResultV4name9platformsAESS_SaySiGtcfcfA0_ : $@convention(thin) () -> @owned Array<Int>
+  struct Result {
+    var name: String
+    var platforms: [Int] = []
+  }
+
+  // CHECK-LABEL: sil hidden [ossa] @$s17default_arguments1EO4testyyFZ : $@convention(method) (@thin E.Type) -> ()
+  static func test() {
+    // CHECK: function_ref @$s17default_arguments1EO6ResultV4name9platformsAESS_SaySiGtcfcfA0_ : $@convention(thin) () -> @owned Array<Int>
+    // CHECK: function_ref @$s17default_arguments1EO4testyyFZAC6ResultVSS_SaySiGtcfu_ : $@convention(thin) (@guaranteed String, @guaranteed Array<Int>) -> @owned E.Result
+
+    // CHECK-LABEL: sil private [ossa] @$s17default_arguments1EO4testyyFZAC6ResultVSS_SaySiGtcfu_ : $@convention(thin) (@guaranteed String, @guaranteed Array<Int>) -> @owned E.Result
+    var result = Self.Result(name: "")
+  }
+}
+
 // FIXME: Arguably we shouldn't allow calling a constructor like this, as
 // we usually require the user write an explicit '.init'.
 struct WeirdUMEInitCase {
diff --git a/test/SILGen/property_wrapper_parameter.swift b/test/SILGen/property_wrapper_parameter.swift

Original file line number	Diff line number	Diff line change
`@@ -1106,7 +1106,7 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {`
`1106`	`1106`	`return;`
`1107`	`1107`
`1108`	`1108`	`// Emit any default argument generators.`
`1109`		`- SGM.emitDefaultArgGenerators(EED, EED->getParameterList());`
	`1109`	`+ SGM.emitArgumentGenerators(EED, EED->getParameterList());`
`1110`	`1110`	`}`
`1111`	`1111`
`1112`	`1112`	`void visitPatternBindingDecl(PatternBindingDecl *pd) {`
`@@ -1141,7 +1141,7 @@ class SILGenType : public TypeMemberVisitor<SILGenType> {`
`1141`	`1141`	`}`
`1142`	`1142`
`1143`	`1143`	`void visitSubscriptDecl(SubscriptDecl *sd) {`
`1144`		`- SGM.emitDefaultArgGenerators(sd, sd->getIndices());`
	`1144`	`+ SGM.emitArgumentGenerators(sd, sd->getIndices());`
`1145`	`1145`	`visitAbstractStorageDecl(sd);`
`1146`	`1146`	`}`
`1147`	`1147`
`@@ -1268,7 +1268,7 @@ class SILGenExtension : public TypeMemberVisitor<SILGenExtension> {`
`1268`	`1268`	`}`
`1269`	`1269`
`1270`	`1270`	`void visitSubscriptDecl(SubscriptDecl *sd) {`
`1271`		`- SGM.emitDefaultArgGenerators(sd, sd->getIndices());`
	`1271`	`+ SGM.emitArgumentGenerators(sd, sd->getIndices());`
`1272`	`1272`	`visitAbstractStorageDecl(sd);`
`1273`	`1273`	`}`
`1274`	`1274`