Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update LLVM and Swift files for Swift 6 #64

Merged
merged 5 commits into from
Jan 14, 2025
Merged

Update LLVM and Swift files for Swift 6 #64

merged 5 commits into from
Jan 14, 2025

Conversation

keith
Copy link
Member

@keith keith commented Jan 14, 2025

Pulls in #62 and #63

jpsim and others added 5 commits January 13, 2025 20:00
Updated some files from https://github.com/apple/llvm-project and
https://github.com/swiftlang/swift.

I'm not confident that I did this correctly, but the tests do pass and
this does fix
#60.

```
$ swift --version
swift-driver version: 1.111.2 Apple Swift version 6.0 (swiftlang-6.0.0.5.15 clang-1600.0.22.6)
Target: arm64-apple-macosx14.0
$ swift test
Building for debugging...
ld: warning: duplicate -rpath '/Applications/Xcode-16.0.0-Beta.3.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib' ignored
[67/67] Linking IndexStorePackageTests
Build complete! (7.53s)
Test Suite 'All tests' started at 2024-07-11 13:12:09.222.
Test Suite 'IndexStorePackageTests.xctest' started at 2024-07-11 13:12:09.223.
Test Suite 'IndexStoreTests' started at 2024-07-11 13:12:09.223.
Test Case '-[IndexStoreTests.IndexStoreTests testExerciseIndexStore]' started.
Test Case '-[IndexStoreTests.IndexStoreTests testExerciseIndexStore]' passed (0.506 seconds).
Test Case '-[IndexStoreTests.IndexStoreTests testMissingIndexStore]' started.
Test Case '-[IndexStoreTests.IndexStoreTests testMissingIndexStore]' passed (0.000 seconds).
Test Suite 'IndexStoreTests' passed at 2024-07-11 13:12:09.729.
	 Executed 2 tests, with 0 failures (0 unexpected) in 0.506 (0.506) seconds
Test Suite 'SwiftDemangleTests' started at 2024-07-11 13:12:09.729.
Test Case '-[SwiftDemangleTests.SwiftDemangleTests testBreathFirstSequence]' started.
Test Case '-[SwiftDemangleTests.SwiftDemangleTests testBreathFirstSequence]' passed (0.000 seconds).
Test Case '-[SwiftDemangleTests.SwiftDemangleTests testDemangle]' started.
Test Case '-[SwiftDemangleTests.SwiftDemangleTests testDemangle]' passed (0.000 seconds).
Test Case '-[SwiftDemangleTests.SwiftDemangleTests testObjCUSR]' started.
Test Case '-[SwiftDemangleTests.SwiftDemangleTests testObjCUSR]' passed (0.000 seconds).
Test Case '-[SwiftDemangleTests.SwiftDemangleTests testSwiftExtensionUSR]' started.
Test Case '-[SwiftDemangleTests.SwiftDemangleTests testSwiftExtensionUSR]' passed (0.000 seconds).
Test Suite 'SwiftDemangleTests' passed at 2024-07-11 13:12:09.730.
	 Executed 4 tests, with 0 failures (0 unexpected) in 0.001 (0.001) seconds
Test Suite 'IndexStorePackageTests.xctest' passed at 2024-07-11 13:12:09.730.
	 Executed 6 tests, with 0 failures (0 unexpected) in 0.507 (0.507) seconds
Test Suite 'All tests' passed at 2024-07-11 13:12:09.730.
	 Executed 6 tests, with 0 failures (0 unexpected) in 0.507 (0.508) seconds
```

This will fail on CI until it is updated to Swift 6.

Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: Marcos Griselli <marcosg@lyft.com>
Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
Seems like in swift 6 some system records have no symbols so they fail
later assertions. We just care that _something_ has valid content

Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>
@keith keith marked this pull request as ready for review January 14, 2025 04:23
@keith keith requested a review from marcosgriselli as a code owner January 14, 2025 04:23
@keith keith merged commit 230c7d8 into main Jan 14, 2025
3 checks passed
@keith keith deleted the ks/swift6 branch January 14, 2025 04:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants