Merge pull request swiftlang#20539 from aschwaighofer/some_enable_implicit_dynamic_fixes

Author: swift-ci

lib/Sema/TypeCheckAttr.cpp

@@ -2466,7 +2466,8 @@ void TypeChecker::addImplicitDynamicAttribute(Decl *D) {
       isa<AccessorDecl>(D))
     return;
 
-  if (!D->getAttrs().hasAttribute<DynamicAttr>()) {
+  if (!D->getAttrs().hasAttribute<DynamicAttr>() &&
+      !D->getAttrs().hasAttribute<DynamicReplacementAttr>()) {
     auto attr = new (D->getASTContext()) DynamicAttr(/*implicit=*/true);
     D->getAttrs().add(attr);
   }

test/Interpreter/Inputs/dynamic_replacement_module.swift

@@ -63,7 +63,71 @@ public enum PublicEnumeration<Q> {
     return "public_enum_generic_func"
   }
 }
+#elseif MODULENODYNAMIC
+public func public_global_func() -> String {
+  return "public_global_func"
+}
+
+public func public_global_generic_func<T>(_ t: T.Type) -> String {
+  return "public_global_generic_func"
+}
+
+public class PublicClass {
+  public var str : String = ""
+  public init() {}
+  public init(x: Int) { str = "public_class_init" }
+
+  public func function() -> String {
+    return "public_class_func"
+  }
+  public func genericFunction<T>(_ t: T.Type) -> String {
+    return "public_class_generic_func"
+  }
+}
+
+public struct PublicStruct {
+  public var str = ""
+  public init() {}
+
+  public init(x: Int) { str = "public_struct_init" }
+
+  public func function() -> String {
+    return "public_struct_func"
+  }
+  public func genericFunction<T>(_ t: T.Type) -> String {
+    return "public_struct_generic_func"
+  }
+  public var public_stored_property : String = "public_stored_property"
 
+  public subscript(_ x: Int) -> String {
+    get {
+      return "public_subscript_get"
+    }
+    set {
+      str = newValue
+    }
+  }
+  public subscript(y x: Int) -> String {
+    _read {
+      yield "public_subscript_get_modify_read"
+    }
+    _modify {
+      yield &str
+    }
+  }
+}
+
+public enum PublicEnumeration<Q> {
+  case A
+  case B
+
+  public func function() -> String {
+    return "public_enum_func"
+  }
+  public func genericFunction<T>(_ t: T.Type) -> String {
+    return "public_enum_generic_func"
+  }
+}
 #elseif MODULE2
 
 import Module1

test/Interpreter/dynamic_replacement.swift

@@ -29,6 +29,23 @@
 // RUN: %target-codesign %t/main %t/libModule1.%target-dylib-extension %t/libModule2.%target-dylib-extension
 // RUN: %target-run %t/main %t/libModule1.%target-dylib-extension %t/libModule2.%target-dylib-extension
 
+// Test the -enable-implicit-dynamic flag.
+
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift-dylib(%t/libModule1.%target-dylib-extension) -DMODULENODYNAMIC -module-name Module1 -emit-module -emit-module-path %t/Module1.swiftmodule -swift-version 5 %S/Inputs/dynamic_replacement_module.swift -Xfrontend -enable-implicit-dynamic
+// RUN: %target-build-swift-dylib(%t/libModule2.%target-dylib-extension) -I%t -L%t -lModule1 -Xlinker -rpath -Xlinker %t -DMODULE2 -module-name Module2 -emit-module -emit-module-path %t/Module2.swiftmodule -swift-version 5 %S/Inputs/dynamic_replacement_module.swift
+// RUN: %target-build-swift -I%t -L%t -lModule1 -DMAIN -o %t/main -Xlinker -rpath -Xlinker %t %s -swift-version 5
+// RUN: %target-codesign %t/main %t/libModule1.%target-dylib-extension %t/libModule2.%target-dylib-extension
+// RUN: %target-run %t/main %t/libModule1.%target-dylib-extension %t/libModule2.%target-dylib-extension
+
+// Test the -enable-implicit-dynamic flag in optimized wholemodule mode.
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift-dylib(%t/libModule1.%target-dylib-extension) -O -wmo -DMODULENODYNAMIC -module-name Module1 -emit-module -emit-module-path %t/Module1.swiftmodule -swift-version 5 %S/Inputs/dynamic_replacement_module.swift -Xfrontend -enable-implicit-dynamic
+// RUN: %target-build-swift-dylib(%t/libModule2.%target-dylib-extension) -O -wmo -I%t -L%t -lModule1 -Xlinker -rpath -Xlinker %t -DMODULE2 -module-name Module2 -emit-module -emit-module-path %t/Module2.swiftmodule -swift-version 5 %S/Inputs/dynamic_replacement_module.swift
+// RUN: %target-build-swift -O -wmo -I%t -L%t -lModule1 -DMAIN -o %t/main -Xlinker -rpath -Xlinker %t %s -swift-version 5
+// RUN: %target-codesign %t/main %t/libModule1.%target-dylib-extension %t/libModule2.%target-dylib-extension
+// RUN: %target-run %t/main %t/libModule1.%target-dylib-extension %t/libModule2.%target-dylib-extension
+
 
 // REQUIRES: executable_test
 

test/SILGen/dynamically_replaceable.swift

@@ -1,5 +1,10 @@
 // RUN: %target-swift-emit-silgen -enable-sil-ownership -swift-version 5 %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -enable-sil-ownership -swift-version 5 %s -enable-implicit-dynamic | %FileCheck %s --check-prefix=IMPLICIT
 
+// CHECK-LABEL: sil hidden @$s23dynamically_replaceable014maybe_dynamic_B0yyF : $@convention(thin) () -> () {
+// IMPLICIT-LABEL: sil hidden [dynamically_replacable] @$s23dynamically_replaceable014maybe_dynamic_B0yyF : $@convention(thin) () -> () {
+func maybe_dynamic_replaceable() {
+}
 
 // CHECK-LABEL: sil hidden [dynamically_replacable] @$s23dynamically_replaceable08dynamic_B0yyF : $@convention(thin) () -> () {
 dynamic func dynamic_replaceable() {