Don't disable stripping the name when -disable-swift-bridge-attr is enabled

Author: aschwaighofer

lib/ClangImporter/ClangImporter.cpp

@@ -1957,12 +1957,8 @@ namespace {
 
 /// Determine whether the given Objective-C class, or any of its
 /// superclasses, either has or inherits a swift_bridge attribute.
-static bool hasOrInheritsSwiftBridgeAttr(
-    const clang::ObjCInterfaceDecl *objcClass,
-    bool DisableSwiftBridgeAttr) {
-  // If we have disabled the attribute just return that there is none.
-  if (DisableSwiftBridgeAttr)
-    return false;
+static bool
+hasOrInheritsSwiftBridgeAttr(const clang::ObjCInterfaceDecl *objcClass) {
   do {
     // Look at the definition, if there is one.
     if (auto def = objcClass->getDefinition())
@@ -2486,8 +2482,7 @@ auto ClangImporter::Implementation::importFullName(
     if (D->getDeclContext()->getRedeclContext()->isFileContext() &&
         (isa<clang::TypeDecl>(D) ||
          (isa<clang::ObjCInterfaceDecl>(D) &&
-          !hasOrInheritsSwiftBridgeAttr(cast<clang::ObjCInterfaceDecl>(D),
-                                        DisableSwiftBridgeAttr)) ||
+          !hasOrInheritsSwiftBridgeAttr(cast<clang::ObjCInterfaceDecl>(D))) ||
          isa<clang::ObjCProtocolDecl>(D))) {
       // Find the original declaration, from which we can determine
       // the owning module.