Merge pull request #25072 from aschwaighofer/local_functions_not_implicit_dynamic-5.1

[5.1] Don't add implicit dynamic to local functions.

Author: aschwaighofer

lib/Sema/TypeCheckAttr.cpp

@@ -2637,6 +2637,10 @@ void TypeChecker::addImplicitDynamicAttribute(Decl *D) {
     // Don't add dynamic to functions with a cdecl.
     if (FD->getAttrs().hasAttribute<CDeclAttr>())
       return;
+    // Don't add dynamic to local function definitions.
+    if (!FD->getDeclContext()->isTypeContext() &&
+        FD->getDeclContext()->isLocalContext())
+      return;
   }
 
   // Don't add dynamic if accessor is inlinable or tranparent.

test/SILGen/dynamically_replaceable.swift

@@ -367,3 +367,18 @@ var x = 10
 defer {
   let y = x
 }
+
+// IMPLICIT-LABEL: sil [dynamically_replacable] [ossa] @$s23dynamically_replaceable16testWithLocalFunyyF
+// IMPLICIT-LABEL: sil private [ossa] @$s23dynamically_replaceable16testWithLocalFunyyF05localF0L_yyF
+// IMPLICIT-LABEL: sil private [ossa] @$s23dynamically_replaceable16testWithLocalFunyyF05localF0L_yyF0geF0L_yyF
+// IMPLICIT-LABEL: sil private [ossa] @$s23dynamically_replaceable16testWithLocalFunyyFyycfU_
+public func testWithLocalFun() {
+  func localFun() {
+    func localLocalFun() { print("bar") }
+    print("foo")
+    localLocalFun()
+  }
+  localFun()
+  let unamedClosure = { print("foo") }
+  unamedClosure()
+}