FIXUP

Author: nate-chandler

include/swift/AST/Decl.h

@@ -1094,8 +1094,20 @@ class alignas(1 << DeclAlignInBits) Decl : public ASTAllocated<Decl> {
   /// Check if this is a declaration defined at the top level of the Swift module
   bool isStdlibDecl() const;
 
+  /// The effective lifetime resulting from the decorations on the declaration.
+  ///
+  /// Usually, this, not getLifetimeAnnotationFromAttributes should be used.
   LifetimeAnnotation getLifetimeAnnotation() const;
 
+  /// The source-level lifetime attribute, either @_eagerMove or @_noEagerMove
+  /// that the declaration bears.
+  ///
+  /// Usually getLifetimeAnnotation should be used.
+  ///
+  /// Needed to access the attributes before the AST has been fully formed, such
+  /// as when printing.
+  LifetimeAnnotation getLifetimeAnnotationFromAttributes() const;
+
   bool isNoImplicitCopy() const {
     return getAttrs().hasAttribute<NoImplicitCopyAttr>();
   }

lib/AST/ASTDumper.cpp

@@ -1030,7 +1030,7 @@ namespace {
       if (P->getAttrs().hasAttribute<NonEphemeralAttr>())
         OS << " nonEphemeral";
 
-      switch (P->getLifetimeAnnotation()) {
+      switch (P->getLifetimeAnnotationFromAttributes()) {
       case LifetimeAnnotation::EagerMove:
         OS << " _eagerMove";
         break;

lib/AST/Decl.cpp

@@ -1080,9 +1080,8 @@ bool Decl::isStdlibDecl() const {
          DC->getParentModule()->isStdlibModule();
 }
 
-static LifetimeAnnotation
-getLifetimeAnnotationFromAttributes(const Decl *decl) {
-  auto &attrs = decl->getAttrs();
+LifetimeAnnotation Decl::getLifetimeAnnotationFromAttributes() const {
+  auto &attrs = getAttrs();
   if (attrs.hasAttribute<EagerMoveAttr>())
     return LifetimeAnnotation::EagerMove;
   if (attrs.hasAttribute<NoEagerMoveAttr>())
@@ -1097,7 +1096,7 @@ LifetimeAnnotation Decl::getLifetimeAnnotation() const {
   if (auto *fd = dyn_cast<FuncDecl>(this)) {
     return fd->getLifetimeAnnotation();
   }
-  return getLifetimeAnnotationFromAttributes(this);
+  return getLifetimeAnnotationFromAttributes();
 }
 
 AvailabilityContext Decl::getAvailabilityForLinkage() const {
@@ -7052,7 +7051,7 @@ LifetimeAnnotation ParamDecl::getLifetimeAnnotation() const {
   if (specifier == ParamDecl::Specifier::Consuming &&
       !getType()->isPureMoveOnly())
     return LifetimeAnnotation::EagerMove;
-  return getLifetimeAnnotationFromAttributes(this);
+  return getLifetimeAnnotationFromAttributes();
 }
 
 StringRef ParamDecl::getSpecifierSpelling(ParamSpecifier specifier) {
@@ -9247,7 +9246,7 @@ LifetimeAnnotation FuncDecl::getLifetimeAnnotation() const {
     if (selfDecl && !selfDecl->getType()->isPureMoveOnly())
       return LifetimeAnnotation::EagerMove;
   }
-  return getLifetimeAnnotationFromAttributes(this);
+  return getLifetimeAnnotationFromAttributes();
 }
 
 bool FuncDecl::isCallAsFunctionMethod() const {

test/SILOptimizer/consuming_parameter.swift

@@ -1,5 +1,7 @@
-// RUN: %target-swift-frontend -c -Xllvm --sil-print-final-ossa-module -O -module-name=main -o /dev/null %s 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -c -disable-availability-checking -Xllvm --sil-print-final-ossa-module -O -module-name=main -o /dev/null %s 2>&1 | %FileCheck %s
 
+// REQUIRES: concurrency
+
 // CHECK-LABEL: sil [ossa] @async_dead_arg_call : {{.*}} {
 // CHECK:       {{bb[0-9]+}}([[INSTANCE:%[^,]+]] : @_eagerMove @owned
 // CHECK:         destroy_value [[INSTANCE]]