Add getDeclContextOrNull to AssignOrInitInst

Author: janbaig

include/swift/SIL/SILInstruction.h

@@ -5310,6 +5310,7 @@ class AssignOrInitInst
 
   StringRef getPropertyName() const;
   AccessorDecl *getReferencedInitAccessor() const;
+  DeclContext *getDeclContextOrNull() const;
 };
 
 /// Indicates that a memory location is uninitialized at this point and needs to

lib/SIL/IR/SILInstructions.cpp

@@ -1355,6 +1355,12 @@ AccessorDecl *AssignOrInitInst::getReferencedInitAccessor() const {
   return Property->getOpaqueAccessor(AccessorKind::Init);
 }
 
+DeclContext *AssignOrInitInst::getDeclContextOrNull() const {
+  if (auto accessorDecl = getReferencedInitAccessor())
+    return accessorDecl->getDeclContext();
+  return getProperty()->getDeclContext();
+}
+
 unsigned AssignOrInitInst::getNumInitializedProperties() const {
   return getInitializedProperties().size();
 }

lib/SILOptimizer/Mandatory/DIMemoryUseCollector.cpp

@@ -1242,11 +1242,8 @@ ElementUseCollector::collectAssignOrInitUses(AssignOrInitInst *Inst,
   llvm::SaveAndRestore<bool> X(IsSelfOfNonDelegatingInitializer, false);
 
   NominalTypeDecl *typeDC = nullptr;
-  if (auto accessorDecl = Inst->getReferencedInitAccessor()) {
-    typeDC = accessorDecl->getDeclContext()->getSelfNominalTypeDecl();
-  } else {
-    typeDC = Inst->getProperty()->getDeclContext()->getSelfNominalTypeDecl();
-  }
+  if (auto declContext = Inst->getDeclContextOrNull()->getSelfNominalTypeDecl())
+    typeDC = declContext;
 
   auto expansionContext = TypeExpansionContext(TheMemory.getFunction());
   auto selfOrLocalTy = Inst->getSelfOrLocalOperand()->getType();