Merge pull request swiftlang#28534 from gottesmm/pr-454c8cb401a20abf72d32b98e7e0bed46651e055

Author: swift-ci

include/swift/SIL/SILInstruction.h

@@ -1397,6 +1397,11 @@ class AllocationInst : public SingleValueInstruction {
 
 public:
   DEFINE_ABSTRACT_SINGLE_VALUE_INST_BOILERPLATE(AllocationInst)
+
+  /// Return the underlying variable declaration associated with this
+  /// allocation, or null if this allocation inst is associated with a temporary
+  /// allocation.
+  VarDecl *getDecl() const;
 };
 
 class DeallocStackInst;
@@ -1439,10 +1444,6 @@ class AllocStackInst final
   void setDynamicLifetime() { dynamicLifetime = true; }
   bool hasDynamicLifetime() const { return dynamicLifetime; }
 
-  /// Return the underlying variable declaration associated with this
-  /// allocation, or null if this is a temporary allocation.
-  VarDecl *getDecl() const;
-
   /// Return the debug variable information attached to this instruction.
   Optional<SILDebugVariable> getVarInfo() const {
     auto RawValue = SILInstruction::Bits.AllocStackInst.VarInfo;
@@ -1685,10 +1686,6 @@ class AllocBoxInst final
   // Return the type of the memory stored in the alloc_box.
   SILType getAddressType() const;
 
-  /// Return the underlying variable declaration associated with this
-  /// allocation, or null if this is a temporary allocation.
-  VarDecl *getDecl() const;
-
   /// Return the debug variable information attached to this instruction.
   Optional<SILDebugVariable> getVarInfo() const {
     return VarInfo.get(getDecl(), getTrailingObjects<char>());

lib/SIL/SILInstructions.cpp

@@ -180,7 +180,7 @@ AllocStackInst::create(SILDebugLocation Loc,
                      hasDynamicLifetime);
 }
 
-VarDecl *AllocStackInst::getDecl() const {
+VarDecl *AllocationInst::getDecl() const {
   return getLoc().getAsASTNode<VarDecl>();
 }
 
@@ -290,10 +290,6 @@ SILType AllocBoxInst::getAddressType() const {
       .getAddressType();
 }
 
-VarDecl *AllocBoxInst::getDecl() const {
-  return getLoc().getAsASTNode<VarDecl>();
-}
-
 DebugValueInst::DebugValueInst(SILDebugLocation DebugLoc, SILValue Operand,
                                SILDebugVariable Var)
     : UnaryInstructionBase(DebugLoc, Operand),