Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/Sema/TypeCheckAttr.cpp

@@ -2706,6 +2706,14 @@ TypeChecker::diagnosticIfDeclCannotBePotentiallyUnavailable(const Decl *D) {
   return None;
 }
 
+static bool shouldBlockImplicitDynamic(Decl *D) {
+  if (D->getAttrs().hasAttribute<NonObjCAttr>() ||
+      D->getAttrs().hasAttribute<SILGenNameAttr>() ||
+      D->getAttrs().hasAttribute<TransparentAttr>() ||
+      D->getAttrs().hasAttribute<InlinableAttr>())
+    return true;
+  return false;
+}
 void TypeChecker::addImplicitDynamicAttribute(Decl *D) {
   if (!D->getModuleContext()->isImplicitDynamicEnabled())
     return;
@@ -2716,10 +2724,9 @@ void TypeChecker::addImplicitDynamicAttribute(Decl *D) {
       isa<AccessorDecl>(D))
     return;
 
-  if (D->getAttrs().hasAttribute<NonObjCAttr>() ||
-      D->getAttrs().hasAttribute<TransparentAttr>() ||
-      D->getAttrs().hasAttribute<InlinableAttr>())
-    return;
+  // Don't add dynamic if decl is inlinable or tranparent.
+  if (shouldBlockImplicitDynamic(D))
+   return;
 
   if (auto *FD = dyn_cast<FuncDecl>(D)) {
     // Don't add dynamic to defer bodies.
@@ -2730,6 +2737,14 @@ void TypeChecker::addImplicitDynamicAttribute(Decl *D) {
       return;
   }
 
+  // Don't add dynamic if accessor is inlinable or tranparent.
+  if (auto *asd = dyn_cast<AbstractStorageDecl>(D)) {
+    for (auto *accessor : asd->getAllAccessors()) {
+      if (!accessor->isImplicit() && shouldBlockImplicitDynamic(accessor))
+        return;
+    }
+  }
+
   if (auto *VD = dyn_cast<VarDecl>(D)) {
     // Don't turn stored into computed properties. This could conflict with
     // exclusivity checking.

test/ParseableInterface/ModuleCache/prebuilt-module-cache-forwarding.swift

@@ -14,7 +14,7 @@
 // RUN: %{python} %S/Inputs/check-is-forwarding-module.py %t/MCP/Lib-*.swiftmodule
 
 // Now invalidate a dependency of the prebuilt module, and make sure the forwarding file is replaced with a real module.
-// RUN: touch %t/Lib.swiftinterface
+// RUN: %{python} %S/Inputs/make-old.py %t/Lib.swiftinterface
 // RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -sdk %S/Inputs -I %S/Inputs/prebuilt-module-cache/ -prebuilt-module-cache-path %t/prebuilt-cache %s 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
 
 // Delete the cached module we just created, and create the forwarding module again

test/attr/implicit_dynamic.swift

@@ -0,0 +1,57 @@
+// RUN: %target-swift-frontend -swift-version 5 -enable-implicit-dynamic  -I %t -emit-silgen %s | %FileCheck %s
+
+// Make sure that these functions are not implicitly marked dynamic.
+
+public struct NotImplicitDynamic {
+  @inlinable
+  public var x : Int {
+// CHECK: sil [serialized] [ossa] @$s16implicit_dynamic18NotImplicitDynamicV1xSivg
+// CHECK: sil [serialized] [ossa] @$s16implicit_dynamic18NotImplicitDynamicV1xSivs
+    get {
+      return 1
+    }
+    set {
+    }
+  }
+
+  @inlinable
+  public var y : Int {
+// CHECK: sil [serialized] [ossa] @$s16implicit_dynamic18NotImplicitDynamicV1ySivg
+    return 1
+  }
+
+  public var z : Int {
+// CHECK: sil [serialized] [ossa] @$s16implicit_dynamic18NotImplicitDynamicV1zSivg
+// CHECK: sil [ossa] @$s16implicit_dynamic18NotImplicitDynamicV1zSivs
+    @inlinable
+    get {
+      return 1
+    }
+    set {
+    }
+  }
+
+  @_transparent
+  public var x2 : Int {
+// CHECK: sil [transparent] [serialized] [ossa] @$s16implicit_dynamic18NotImplicitDynamicV2x2Sivg
+// CHECK: sil [transparent] [serialized] [ossa] @$s16implicit_dynamic18NotImplicitDynamicV2x2Sivs
+    get {
+      return 1
+    }
+    set {
+    }
+  }
+
+  public subscript() -> Int {
+// CHECK: sil [transparent] [serialized] [ossa] @$s16implicit_dynamic18NotImplicitDynamicVSiycig
+    @_transparent
+    get{
+      return 1
+    }
+  }
+}
+
+// CHECK: sil [ossa] @foobar
+@_silgen_name("foobar")
+public func noImplicitDynamicFunc() {
+}