Merge pull request #58937 from plotfi/availability-cxx-interop-renamed

[cxx-interop] Pass clangSema.TUScope when calling LookupName for availability

Author: plotfi

lib/ClangImporter/ImportDecl.cpp

@@ -8688,7 +8688,7 @@ getSwiftNameFromClangName(StringRef replacement) {
   clang::LookupResult lookupResult(clangSema, identifier,
                                    clang::SourceLocation(),
                                    clang::Sema::LookupOrdinaryName);
-  if (!clangSema.LookupName(lookupResult, nullptr))
+  if (!clangSema.LookupName(lookupResult, clangSema.TUScope))
     return "";
 
   auto clangDecl = lookupResult.getAsSingle<clang::NamedDecl>();

test/Interop/Cxx/availability/Inputs/SomeModule.h

@@ -0,0 +1,9 @@
+typedef char* NSString;
+
+typedef NSString *NSValueTransformerName __attribute__((swift_wrapper(struct)));
+
+extern "C" NSValueTransformerName const NSUnarchiveFromDataTransformerName
+  __attribute__((availability(macos,introduced=10.3,deprecated=10.14,replacement="NSSecureUnarchiveFromDataTransformerName")))
+  __attribute__((availability(ios,introduced=3.0,deprecated=12.0,replacement="NSSecureUnarchiveFromDataTransformerName")))
+  __attribute__((availability(watchos,introduced=2.0,deprecated=5.0,replacement="NSSecureUnarchiveFromDataTransformerName")))
+  __attribute__((availability(tvos,introduced=9.0,deprecated=12.0,replacement="NSSecureUnarchiveFromDataTransformerName")));

test/Interop/Cxx/availability/Inputs/module.modulemap

@@ -0,0 +1,4 @@
+module SomeModule [extern_c] {
+  requires objc
+  header "SomeModule.h"
+}

test/Interop/Cxx/availability/availability-objcxx-smoke.swift

@@ -0,0 +1,5 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=SomeModule -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop -enable-objc-interop | %FileCheck %s
+
+import SomeModule
+
+// CHECK: @available(swift, obsoleted: 3, renamed: "NSValueTransformerName.unarchiveFromDataTransformerName")