Merge pull request #37175 from kavon/cherry-pick-5.5/eff-prop-extension-interface-bug

[5.5] fix missing effects specifiers on some properties in swiftinterface

Author: kavon

include/swift/Basic/Features.def

@@ -36,6 +36,7 @@
 
 LANGUAGE_FEATURE(StaticAssert, 0, "#assert", langOpts.EnableExperimentalStaticAssert)
 LANGUAGE_FEATURE(AsyncAwait, 296, "async/await", true)
+LANGUAGE_FEATURE(EffectfulProp, 310, "Effectful properties", langOpts.EnableExperimentalConcurrency)
 LANGUAGE_FEATURE(MarkerProtocol, 0, "@_marker protocol", true)
 LANGUAGE_FEATURE(Actors, 0, "actors", true)
 LANGUAGE_FEATURE(ConcurrentFunctions, 0, "@concurrent functions", true)

lib/AST/ASTPrinter.cpp

@@ -2481,6 +2481,12 @@ static bool usesFeatureStaticAssert(Decl *decl) {
   return false;
 }
 
+static bool usesFeatureEffectfulProp(Decl *decl) {
+  if (auto asd = dyn_cast<AbstractStorageDecl>(decl))
+    return asd->getEffectfulGetAccessor() != nullptr;
+  return false;
+}
+
 static bool usesFeatureAsyncAwait(Decl *decl) {
   if (auto func = dyn_cast<AbstractFunctionDecl>(decl)) {
     if (func->hasAsync())
@@ -2857,6 +2863,12 @@ static std::vector<Feature> getUniqueFeaturesUsed(Decl *decl) {
 
 bool swift::printCompatibilityFeatureChecksPre(
     ASTPrinter &printer, Decl *decl) {
+
+  // A single accessor does not get a feature check,
+  // it should go around the whole decl.
+  if (isa<AccessorDecl>(decl))
+    return false;
+
   auto features = getUniqueFeaturesUsed(decl);
   if (features.empty())
     return false;
@@ -3496,6 +3508,10 @@ void PrintAST::visitAccessorDecl(AccessorDecl *decl) {
       });
   }
 
+  // handle effects specifiers before the body
+  if (decl->hasAsync()) Printer << " async";
+  if (decl->hasThrows()) Printer << " throws";
+
   printBodyIfNecessary(decl);
 }
 

test/ModuleInterface/effectful_properties.swift

@@ -0,0 +1,61 @@
+// RUN: %target-swift-frontend -enable-experimental-concurrency -typecheck -swift-version 5 -enable-library-evolution -emit-module-interface-path %t.swiftinterface %s -module-name EffProps
+// RUN: %FileCheck %s < %t.swiftinterface
+
+public struct MyStruct {}
+
+// CHECK-LABEL:  #if compiler(>=5.3) && $EffectfulProp
+// CHECK:        public var status: Swift.Bool {
+// CHECK:          get async throws
+// CHECK:        }
+// CHECK:        #endif
+
+public extension MyStruct {
+  struct InnerStruct {
+      public var status: Bool { get async throws { false } }
+    }
+}
+
+// CHECK-LABEL:  #if compiler(>=5.3) && $EffectfulProp
+// CHECK:        public var hello: Swift.Int {
+// CHECK:            get async
+// CHECK:          }
+// CHECK:        #endif
+
+
+// CHECK-LABEL:  #if compiler(>=5.3) && $EffectfulProp
+// CHECK:        public subscript(x: Swift.Int) -> Swift.Void {
+// CHECK:            get async throws
+// CHECK:          }
+// CHECK:        #endif
+
+public class C {
+  public var hello: Int { get async { 0 } }
+
+  public subscript(_ x: Int) -> Void {
+    get async throws { }
+  }
+}
+
+// CHECK-LABEL:  #if compiler(>=5.3) && $EffectfulProp
+// CHECK:        public var world: Swift.Int {
+// CHECK:          get throws
+// CHECK:        }
+// CHECK:        #endif
+
+public enum E {
+  public var world: Int { get throws { 0 } }
+}
+
+// CHECK-LABEL:  #if compiler(>=5.3) && $EffectfulProp
+// CHECK:        var books: Swift.Int { get async }
+// CHECK:        #endif
+
+
+// CHECK-LABEL:  #if compiler(>=5.3) && $EffectfulProp
+// CHECK:        subscript(x: Swift.Int) -> Swift.Int { get throws }
+// CHECK:        #endif
+
+public protocol P {
+  var books: Int { get async }
+  subscript(_ x: Int) -> Int { get throws }
+}