Factor out SILDeclRef::getInitializationExpr

Author: hamishknight

include/swift/SIL/SILDeclRef.h

@@ -565,6 +565,11 @@ struct SILDeclRef {
   /// subclassed.
   SubclassScope getSubclassScope() const;
 
+  /// For a SILDeclRef that describes a variable initializer or backing
+  /// initializer, retrieves the expression that will be emitted for that
+  /// initialization. Otherwise, returns \c nullptr.
+  Expr *getInitializationExpr() const;
+
   bool isDynamicallyReplaceable() const;
 
   bool canBeDynamicReplacement() const;

lib/SIL/IR/SILDeclRef.cpp

@@ -16,6 +16,7 @@
 #include "swift/AST/AnyFunctionRef.h"
 #include "swift/AST/Initializer.h"
 #include "swift/AST/ParameterList.h"
+#include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/ClangImporter/ClangImporter.h"
 #include "swift/ClangImporter/ClangModule.h"
@@ -1497,6 +1498,45 @@ SubclassScope SILDeclRef::getSubclassScope() const {
   llvm_unreachable("Unhandled access level in switch.");
 }
 
+Expr *SILDeclRef::getInitializationExpr() const {
+  switch (kind) {
+  case Kind::StoredPropertyInitializer: {
+    auto *var = cast<VarDecl>(getDecl());
+    auto *pbd = var->getParentPatternBinding();
+    unsigned idx = pbd->getPatternEntryIndexForVarDecl(var);
+    auto *init = pbd->getInit(idx);
+    assert(!pbd->isInitializerSubsumed(idx));
+
+    // If this is the backing storage for a property with an attached wrapper
+    // that was initialized with `=`, use that expression as the initializer.
+    if (auto originalProperty = var->getOriginalWrappedProperty()) {
+      if (originalProperty->isPropertyMemberwiseInitializedWithWrappedType()) {
+        auto wrapperInfo =
+            originalProperty->getPropertyWrapperInitializerInfo();
+        auto *placeholder = wrapperInfo.getWrappedValuePlaceholder();
+        init = placeholder->getOriginalWrappedValue();
+        assert(init);
+      }
+    }
+    return init;
+  }
+  case Kind::PropertyWrapperBackingInitializer: {
+    auto *var = cast<VarDecl>(getDecl());
+    auto wrapperInfo = var->getPropertyWrapperInitializerInfo();
+    assert(wrapperInfo.hasInitFromWrappedValue());
+    return wrapperInfo.getInitFromWrappedValue();
+  }
+  case Kind::PropertyWrapperInitFromProjectedValue: {
+    auto *var = cast<VarDecl>(getDecl());
+    auto wrapperInfo = var->getPropertyWrapperInitializerInfo();
+    assert(wrapperInfo.hasInitFromProjectedValue());
+    return wrapperInfo.getInitFromProjectedValue();
+  }
+  default:
+    return nullptr;
+  }
+}
+
 unsigned SILDeclRef::getParameterListCount() const {
   // Only decls can introduce currying.
   if (!hasDecl())

lib/SILGen/SILGen.cpp

@@ -944,22 +944,10 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
 
     auto *pbd = var->getParentPatternBinding();
     unsigned idx = pbd->getPatternEntryIndexForVarDecl(var);
-    auto *init = pbd->getInit(idx);
     auto *initDC = pbd->getInitContext(idx);
     auto captureInfo = pbd->getCaptureInfo(idx);
-    assert(!pbd->isInitializerSubsumed(idx));
-
-    // If this is the backing storage for a property with an attached wrapper
-    // that was initialized with `=`, use that expression as the initializer.
-    if (auto originalProperty = var->getOriginalWrappedProperty()) {
-      if (originalProperty
-              ->isPropertyMemberwiseInitializedWithWrappedType()) {
-        auto wrapperInfo =
-            originalProperty->getPropertyWrapperInitializerInfo();
-        assert(wrapperInfo.getWrappedValuePlaceholder()->getOriginalWrappedValue());
-        init = wrapperInfo.getWrappedValuePlaceholder()->getOriginalWrappedValue();
-      }
-    }
+    auto *init = constant.getInitializationExpr();
+    assert(init);
 
     auto loc = RegularLocation::getAutoGeneratedLocation(init);
     preEmitFunction(constant, f, loc);
@@ -989,13 +977,14 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
     preEmitFunction(constant, f, loc);
     PrettyStackTraceSILFunction X(
         "silgen emitPropertyWrapperBackingInitializer", f);
-    auto wrapperInfo = var->getPropertyWrapperInitializerInfo();
-    assert(wrapperInfo.hasInitFromWrappedValue());
-    f->createProfiler(wrapperInfo.getInitFromWrappedValue(), constant);
+
+    auto *init = constant.getInitializationExpr();
+    assert(init);
+
+    f->createProfiler(init, constant);
     auto varDC = var->getInnermostDeclContext();
     SILGenFunction SGF(*this, *f, varDC);
-    SGF.emitGeneratorFunction(constant, wrapperInfo.getInitFromWrappedValue(),
-                              /*EmitProfilerIncrement*/ true);
+    SGF.emitGeneratorFunction(constant, init, /*EmitProfilerIncrement*/ true);
     postEmitFunction(constant, f);
     break;
   }
@@ -1007,12 +996,14 @@ void SILGenModule::emitFunctionDefinition(SILDeclRef constant, SILFunction *f) {
     preEmitFunction(constant, f, loc);
     PrettyStackTraceSILFunction X(
         "silgen emitPropertyWrapperInitFromProjectedValue", f);
-    auto initInfo = var->getPropertyWrapperInitializerInfo();
-    assert(initInfo.hasInitFromProjectedValue());
-    f->createProfiler(initInfo.getInitFromProjectedValue(), constant);
+
+    auto *init = constant.getInitializationExpr();
+    assert(init);
+
+    f->createProfiler(init, constant);
     auto varDC = var->getInnermostDeclContext();
     SILGenFunction SGF(*this, *f, varDC);
-    SGF.emitGeneratorFunction(constant, initInfo.getInitFromProjectedValue());
+    SGF.emitGeneratorFunction(constant, init);
     postEmitFunction(constant, f);
     break;
   }