Add isNativeDynamic() and use it

Author: aschwaighofer

include/swift/AST/Decl.h

@@ -2597,6 +2597,10 @@ class ValueDecl : public Decl {
     return isObjC() && isDynamic();
   }
 
+  bool isNativeDynamic() const {
+    return !isObjC() && isDynamic();
+  }
+
   /// Set whether this type is 'dynamic' or not.
   void setIsDynamic(bool value);
 

lib/AST/ASTVerifier.cpp

@@ -3149,12 +3149,12 @@ class Verifier : public ASTWalker {
                storageDecl->getWriteImpl() ==
                    WriteImplKind::StoredWithObservers ||
                storageDecl->getWriteImpl() == WriteImplKind::MutableAddress) &&
-              storageDecl->isDynamic() && !storageDecl->isObjC()) &&
+              storageDecl->isNativeDynamic()) &&
             // We allow a non dynamic getter if there is a dynamic read.
             !(FD->isGetter() &&
               (storageDecl->getReadImpl() == ReadImplKind::Read ||
                storageDecl->getReadImpl() == ReadImplKind::Address) &&
-              storageDecl->isDynamic() && !storageDecl->isObjC())) {
+              storageDecl->isNativeDynamic())) {
           Out << "Property and accessor do not match for 'dynamic'\n";
           abort();
         }

lib/AST/Decl.cpp

@@ -1549,7 +1549,7 @@ getDirectReadWriteAccessStrategy(const AbstractStorageDecl *storage) {
     return AccessStrategy::getStorage();
   case ReadWriteImplKind::Stored: {
     // If the storage isDynamic (and not @objc) use the accessors.
-    if (storage->isDynamic() && !storage->isObjC())
+    if (storage->isNativeDynamic())
       return AccessStrategy::getMaterializeToTemporary(
           getOpaqueReadAccessStrategy(storage, false),
           getOpaqueWriteAccessStrategy(storage, false));
@@ -1623,7 +1623,7 @@ AbstractStorageDecl::getAccessStrategy(AccessSemantics semantics,
       if (isPolymorphic(this))
         return getOpaqueAccessStrategy(this, accessKind, /*dispatch*/ true);
 
-      if (isDynamic())
+      if (isNativeDynamic())
         return getOpaqueAccessStrategy(this, accessKind, /*dispatch*/ false);
 
       // If the storage is resilient to the given use DC (perhaps because

lib/SIL/SILDeclRef.cpp

@@ -973,5 +973,5 @@ bool SILDeclRef::isDynamicallyReplaceable() const {
     return false;
 
   auto decl = getDecl();
-  return decl->isDynamic() && !decl->isObjC();
+  return decl->isNativeDynamic();
 }

lib/Sema/CodeSynthesis.cpp

@@ -2043,8 +2043,7 @@ void swift::maybeAddAccessorsToStorage(TypeChecker &TC,
 
   if (!dc->isTypeContext()) {
     // dynamic globals need accessors.
-    if (dc->isModuleScopeContext() && storage->isDynamic() &&
-        !storage->isObjC()) {
+    if (dc->isModuleScopeContext() && storage->isNativeDynamic()) {
       addTrivialAccessorsToStorage(storage, TC);
       return;
     }

lib/Sema/TypeCheckAttr.cpp

@@ -2175,7 +2175,7 @@ void TypeChecker::checkDynamicReplacementAttribute(ValueDecl *D) {
     return;
   }
 
-  if (D->isDynamic() && !D->isObjC()) {
+  if (D->isNativeDynamic()) {
     diagnose(attr->getLocation(), diag::dynamic_replacement_must_not_be_dynamic,
              D->getBaseName());
     attr->setInvalid();

lib/TBDGen/TBDGen.cpp

@@ -165,7 +165,7 @@ void TBDGenVisitor::visitAbstractFunctionDecl(AbstractFunctionDecl *AFD) {
   addSymbol(SILDeclRef(AFD));
 
   // Add the global function pointer for a dynamically replaceable function.
-  if (AFD->isDynamic() && ! AFD->isObjC()) {
+  if (AFD->isNativeDynamic()) {
     addSymbol(LinkEntity::forDynamicallyReplaceableFunctionVariable(AFD));
     addSymbol(LinkEntity::forDynamicallyReplaceableFunctionImpl(AFD));
     addSymbol(LinkEntity::forDynamicallyReplaceableFunctionKey(AFD));