How is this attribute going to handle a trampoline that performs a virtual dispatch from C++ call into Swift? In that case, the target is not known.

updated test file with correct version check.

• Updated version to be the date.
• Updated release notes.
• Fixed a bug in my changed tablegen code in previous patch.

@erichkeane ping.

updated patch.

Updated __has_attribute(external_source_symbol) to return a version.

@erichkeane I've added more test coverage with different USR values, C++ decls and some dependent C++ decls too. How does it look now?

add more test coverage

I posted the Swift patch here:
https://github.com/apple/swift/pull/63002

In D141324#4039629, @erichkeane wrote:

I'm disturbed that the string-literal diagnostic you changed never shows up in the tests. I suspect this attribute needs significantly better test coverage.

Updated to address review comments.

Thanks, LGTM

Great, thank you!

Unfortunately I'm unable to revert this commit now so we won't be able to get the bot back to green until it's fixed.

This change has caused a failure in Clang's stage 2 CI on the green dragon Darwin CI: https://green.lab.llvm.org/green/job/clang-stage2-Rthinlto/6390/console.

Thanks, this LGTM. You might want to get another reviewers approval as well.

LGTM!

Thanks, this looks good!

@rnk this is option is needed to vendor the Apple clang toolchain in Xcode. Unfortunately we don't have any references to it in the upstream llvm-project repo, but this is breaking our downstream integration. Can this be reverted?

Marked them as unsupported on AIX in 1b34f1e996565bc5e4f2be14b89f881f8fe0f3b9.

@Jake-Egan
I'm going to disable these tests for aix for now to unblock the bot as they're still failing.

@Jake-Egan
Do you happen to have suggestions for how to try to reproduce this? Looking at the failure it looks like this CI job somehow was unable to be affected by this change, for instance the CI output of index-concept-kind.cpp does not have any concepts output:

Sure, investigating.

Fix the windows test failure (add -fno-delayed-template-parsing)

Yes, I'm going to check what's wrong with it.

LGTM, with one request.

Great, thanks for adding the test case!

The change itself LGTM.

clang -x objective-c++ -Weverything -std=c++14 -c test.mm

I don't think this patch is sound. I found this problem with this change when the following file is compiled in Objective-C++ mode:

I see, thanks! Let me think a bit more about this change and test it on our codebase to see if this is a viable Sema change.

Is there a Swift-based test case you have that demonstrates the original problem from Swift's clang importer side? I'm curious to see where it manifests in Swift.

No, I will land it today.

LGTM

In D118862#3321343, @gulfem wrote:

The following two tests started failing in our bots:

Clang :: Driver/darwin-ld-platform-version-target-version.c
Clang :: Driver/darwin-zippered-target-version.c

https://luci-milo.appspot.com/ui/p/fuchsia/builders/toolchain.ci/clang-linux-x64/b8822219707275734081/overview

The error message is as the following:

Script:
--
: 'RUN: at line 1';   touch /b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o
: 'RUN: at line 3';   /b/s/w/ir/x/w/staging/llvm_build/bin/clang -target x86_64-apple-ios13.1-macabi -darwin-target-variant x86_64-apple-macos10.15 -isysroot /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### /b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o 2>&1    | /b/s/w/ir/x/w/staging/llvm_build/bin/FileCheck /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/darwin-ld-platform-version-target-version.c
: 'RUN: at line 5';   /b/s/w/ir/x/w/staging/llvm_build/bin/clang -target x86_64-apple-macos10.14.3 -darwin-target-variant x86_64-apple-ios13.1-macabi -isysroot /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### /b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o 2>&1    | /b/s/w/ir/x/w/staging/llvm_build/bin/FileCheck --check-prefix=CHECK-INV /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/darwin-ld-platform-version-target-version.c
: 'RUN: at line 8';   /b/s/w/ir/x/w/staging/llvm_build/bin/clang -target arm64-apple-ios13.1-macabi -darwin-target-variant arm64-apple-macos10.15 -isysroot /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### /b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o 2>&1    | /b/s/w/ir/x/w/staging/llvm_build/bin/FileCheck --check-prefix=ARM64_NEW /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/darwin-ld-platform-version-target-version.c
: 'RUN: at line 10';   /b/s/w/ir/x/w/staging/llvm_build/bin/clang -target arm64-apple-macos10.15 -darwin-target-variant arm64-apple-ios13.1-macabi  -isysroot /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### /b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o 2>&1    | /b/s/w/ir/x/w/staging/llvm_build/bin/FileCheck --check-prefix=ARM64_NEW-INV /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/darwin-ld-platform-version-target-version.c
: 'RUN: at line 12';   /b/s/w/ir/x/w/staging/llvm_build/bin/clang -target arm64-apple-ios13.1-macabi -darwin-target-variant arm64-apple-macos10.15 -isysroot /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=400 -### /b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o 2>&1    | /b/s/w/ir/x/w/staging/llvm_build/bin/FileCheck --check-prefix=ARM64_OLD /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/darwin-ld-platform-version-target-version.c
: 'RUN: at line 14';   /b/s/w/ir/x/w/staging/llvm_build/bin/clang -target arm64-apple-macos10.15 -darwin-target-variant arm64-apple-ios13.1-macabi -isysroot /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=400 -### /b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o 2>&1    | /b/s/w/ir/x/w/staging/llvm_build/bin/FileCheck --check-prefix=ARM64_OLD-INV /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/darwin-ld-platform-version-target-version.c
--
Exit Code: 1

Command Output (stderr):
--
/b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/darwin-ld-platform-version-target-version.c:29:15: error: ARM64_OLD: expected string not found in input
// ARM64_OLD: "-maccatalyst_version_min" "14.0.0" "-macosx_version_min" "11.0.0"
              ^
<stdin>:1:1: note: scanning from here
Fuchsia clang version 15.0.0 (https://llvm.googlesource.com/a/llvm-project cccef321096c20825fe8738045c1d91d3b9fd57d)
^
<stdin>:5:109: note: possible intended match here
 "/b/s/w/ir/x/w/staging/llvm_build/bin/ld64.lld" "-demangle" "-dynamic" "-arch" "arm64" "-platform_version" "mac catalyst" "14.0.0" "13.1" "-platform_version" "macos" "11.0.0" "10.15" "-syslibroot" "/b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk" "-o" "a.out" "/b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o" "-lSystem"
                                                                                                            ^

Input file: <stdin>
Check file: /b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/darwin-ld-platform-version-target-version.c

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            1: Fuchsia clang version 15.0.0 (https://llvm.googlesource.com/a/llvm-project cccef321096c20825fe8738045c1d91d3b9fd57d) 
check:29'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
            2: Target: arm64-apple-ios13.1-macabi 
check:29'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            3: Thread model: posix 
check:29'0     ~~~~~~~~~~~~~~~~~~~~
            4: InstalledDir: /b/s/w/ir/x/w/staging/llvm_build/bin 
check:29'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            5:  "/b/s/w/ir/x/w/staging/llvm_build/bin/ld64.lld" "-demangle" "-dynamic" "-arch" "arm64" "-platform_version" "mac catalyst" "14.0.0" "13.1" "-platform_version" "macos" "11.0.0" "10.15" "-syslibroot" "/b/s/w/ir/x/w/llvm-llvm-project/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk" "-o" "a.out" "/b/s/w/ir/x/w/staging/llvm_build/tools/clang/test/Driver/Output/darwin-ld-platform-version-target-version.c.tmp.o" "-lSystem" 
check:29'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:29'1                                                                                                                 ?                                                                                                                                                                                                                                                                                                                           possible intended match
>>>>>>

--

Add checking for -darwin-target-variant support

In D118875#3296030, @bc-lee wrote:

Hi, I built and tested clang using this patch and https://reviews.llvm.org/D118862. It works great.
The current patch adds the -darwin-target-variant flag to all object files for MacOS targets in the compiler_rt's builtin library. However, users building compiler_rt may have compilers that don't support such flag, so it would be nice to have a CMake option to enable compiler flags like COMPILER_RT_ENABLE_CATALYST.

Can you add a test case that verifies that using driverkit without a version will default it to driverkit19?

To github.com:llvm/llvm-project.git

bdf573652138..3f05192c4c40  main -> main

Yep, I just noticed. Reverting for now and will fix LLDB before recommitting.

Cheers, LGTM

LG, thanks!

Fix test failure with asserts enabled.

Update to address review feedback, remove appendToken which is not needed as we're can just setTokens instead (it's a new macro info)

Thanks, that feedback makes sense. I'll update the patch today.