Synthesize accessors for dynamic global variables

Author: aschwaighofer

lib/SIL/SILDeclRef.cpp

@@ -964,7 +964,8 @@ bool SILDeclRef::isDynamicallyReplaceable() const {
     return false;
 
   if (kind == SILDeclRef::Kind::Destroyer ||
-      kind == SILDeclRef::Kind::Initializer) {
+      kind == SILDeclRef::Kind::Initializer ||
+      kind == SILDeclRef::Kind::GlobalAccessor) {
     return false;
   }
 

lib/Sema/CodeSynthesis.cpp

@@ -2042,6 +2042,12 @@ void swift::maybeAddAccessorsToStorage(TypeChecker &TC,
     return;
 
   if (!dc->isTypeContext()) {
+    // dynamic globals need accessors.
+    if (dc->isModuleScopeContext() && storage->isDynamic() &&
+        !storage->isObjC()) {
+      addTrivialAccessorsToStorage(storage, TC);
+      return;
+    }
     // Fixed-layout global variables don't get accessors.
     if (!storage->isResilient())
       return;

test/Interpreter/Inputs/dynamic_replacement_module.swift

@@ -1,4 +1,6 @@
 #if MODULE
+public dynamic var public_global_var = "public_global_var"
+
 public dynamic func public_global_func() -> String {
   return "public_global_func"
 }
@@ -64,6 +66,8 @@ public enum PublicEnumeration<Q> {
   }
 }
 #elseif MODULENODYNAMIC
+public var public_global_var = "public_global_var"
+
 public func public_global_func() -> String {
   return "public_global_func"
 }
@@ -134,6 +138,11 @@ import Module1
 
 /// Public global functions, struct, class, and enum.
 
+@_dynamicReplacement(for: public_global_var)
+public var replacement_for_public_global_var : String {
+  return "replacement of " + public_global_var
+}
+
 @_dynamicReplacement(for: public_global_func())
 public func replacement_for_public_global_func() -> String {
   return "replacement of " + public_global_func()

test/Interpreter/dynamic_replacement.swift

@@ -72,6 +72,8 @@ func expectedResult(_ forOriginalLibrary: Bool,  _ expectedOriginalString: Strin
 }
 
 func checkExpectedResults(forOriginalLibrary useOrig: Bool) {
+ expectTrue(public_global_var == expectedResult(useOrig, "public_global_var"))
+
  expectTrue(public_global_func() ==
             expectedResult(useOrig, "public_global_func"))
  expectTrue(public_global_generic_func(Int.self) ==

test/SILGen/dynamically_replaceable.swift

@@ -271,3 +271,14 @@ extension GenericS {
     }
   }
 }
+
+dynamic var globalX = 0
+// CHECK-LABEL: sil hidden [dynamically_replacable] @$s23dynamically_replaceable7globalXSivg : $@convention(thin) () -> Int
+// CHECK-LABEL: sil hidden [dynamically_replacable] @$s23dynamically_replaceable7globalXSivs : $@convention(thin) (Int) -> ()
+// CHECK-LABEL: sil hidden @$s23dynamically_replaceable7getsetXyS2iF
+// CHECK: dynamic_function_ref @$s23dynamically_replaceable7globalXSivs
+// CHECK: dynamic_function_ref @$s23dynamically_replaceable7globalXSivg
+func getsetX(_ x: Int) -> Int {
+  globalX = x
+  return globalX
+}