Move the isImplicitDynamicEnabled into addImplicitDynamicAttribute

Author: aschwaighofer

lib/Sema/TypeCheckAttr.cpp

@@ -2451,6 +2451,9 @@ TypeChecker::diagnosticIfDeclCannotBePotentiallyUnavailable(const Decl *D) {
 }
 
 void TypeChecker::addImplicitDynamicAttribute(Decl *D) {
+  if (!decl->getModuleContext()->isImplicitDynamicEnabled())
+    return;
+
   // Add the attribute if the decl kind allows it and it is not an accessor
   // decl. Accessor decls should always infer the var/subscript's attribute.
   if (!DeclAttribute::canAttributeAppearOnDecl(DAK_Dynamic, D) ||

lib/Sema/TypeCheckDecl.cpp

@@ -1215,9 +1215,7 @@ IsDynamicRequest::evaluate(Evaluator &evaluator, ValueDecl *decl) const {
     return false;
 
   // Add dynamic if -enable-implicit-dynamic was requested.
-  if (decl->getModuleContext()->isImplicitDynamicEnabled()) {
-    TypeChecker::addImplicitDynamicAttribute(decl);
-  }
+  TypeChecker::addImplicitDynamicAttribute(decl);
 
   // If 'dynamic' was explicitly specified, check it.
   if (decl->getAttrs().hasAttribute<DynamicAttr>()) {