Merge pull request #20598 from aschwaighofer/no_implicit_dynamic_local_implicit_vars

Don't add implicit dynamic to variables to local and implicit vars

Author: aschwaighofer

lib/Sema/TypeCheckAttr.cpp

@@ -2457,6 +2457,21 @@ void TypeChecker::addImplicitDynamicAttribute(Decl *D) {
       isa<AccessorDecl>(D))
     return;
 
+  if (D->getAttrs().hasAttribute<FinalAttr>() ||
+      D->getAttrs().hasAttribute<NonObjCAttr>() ||
+      D->getAttrs().hasAttribute<TransparentAttr>() ||
+      D->getAttrs().hasAttribute<InlinableAttr>())
+    return;
+
+  if (auto *VD = dyn_cast<VarDecl>(D)) {
+    // Don't add dynamic to local variables.
+    if (VD->getDeclContext()->isLocalContext())
+      return;
+    // Don't add to implicit variables.
+    if (VD->isImplicit())
+      return;
+  }
+
   if (!D->getAttrs().hasAttribute<DynamicAttr>() &&
       !D->getAttrs().hasAttribute<DynamicReplacementAttr>()) {
     auto attr = new (D->getASTContext()) DynamicAttr(/*implicit=*/true);