Do not test inferior Swift libraries on Darwin #5611

neonichu · 2022-06-21T17:14:56Z

On platforms with ABI-stable Swift runtime libraries (currently only Darwin), we should not set DYLD_LIBRARY_PATHS to include the inferior Swift libs in bootstrap because compatibility issues can arise from SwiftPM's use of Foundation (which itself is a client of the stdlib) and from using dyld4 (which is used on macOS 12+).

rdar://88475529

neonichu · 2022-06-21T17:15:08Z

@swift-ci please smoke test

tomerd · 2022-06-21T17:56:57Z

@shahmishal can you test this before we merge?

shahmishal · 2022-06-21T17:57:48Z

Yes, I will reply back here once I have results

neonichu · 2022-06-21T18:50:13Z

2022-06-21 18:16:07.699 swiftpm-xctest-helper[65989:431473] Error loading /Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/release/SwiftPMPackageTests.xctest/Contents/MacOS/SwiftPMPackageTests:  dlopen(/Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/release/SwiftPMPackageTests.xctest/Contents/MacOS/SwiftPMPackageTests, 265): Library not loaded: @rpath/libswift_Concurrency.dylib
      Referenced from: /Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/release/SwiftPMPackageTests.xctest/Contents/MacOS/SwiftPMPackageTests
      Reason: image not found

Looks like this doesn't work as-is because some tests are linking libswift_Concurrency.dylib but it isn't present on the system. I think we have to include the back deployment path in DYLD_LIBRARY_PATH.

neonichu · 2022-06-21T19:04:09Z

@swift-ci please smoke test

neonichu · 2022-06-21T19:52:41Z

TypeError: can only concatenate list (not "str") to list 🤣

neonichu · 2022-06-21T19:53:28Z

@swift-ci please smoke test

Utilities/bootstrap

neonichu · 2022-06-21T21:43:02Z

Missing a / in the computed path

neonichu · 2022-06-21T21:44:00Z

@swift-ci please smoke test

On platforms with ABI-stable Swift runtime libraries (currently only Darwin), we should not set `DYLD_LIBRARY_PATHS` to include the inferior Swift libs in `bootstrap` because compatibility issues can arise from SwiftPM's use of Foundation (which itself is a client of the stdlib) and from using dyld4 (which is used on macOS 12+). rdar://88475529

neonichu · 2022-06-21T22:53:47Z

@swift-ci please smoke test

neonichu · 2022-06-21T23:43:27Z

Same error as before:

2022-06-21 23:33:52.020 swiftpm-xctest-helper[66157:1081111] Error loading /Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/release/SwiftPMPackageTests.xctest/Contents/MacOS/SwiftPMPackageTests:  dlopen(/Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/release/SwiftPMPackageTests.xctest/Contents/MacOS/SwiftPMPackageTests, 265): Library not loaded: @rpath/libswift_Concurrency.dylib
      Referenced from: /Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swiftpm-macosx-x86_64/x86_64-apple-macosx/release/SwiftPMPackageTests.xctest/Contents/MacOS/SwiftPMPackageTests
      Reason: image not found

neonichu · 2022-06-21T23:45:28Z

What I see locally is:

❯ otool -l ./x86_64-apple-macosx/debug/SwiftPMPackageTests.xctest/Contents/MacOS/SwiftPMPackageTests
[...]
          cmd LC_RPATH
      cmdsize 200
         path /Volumes/Xcode.../Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.5/macosx (offset 12)
Load command 43
          cmd LC_RPATH
      cmdsize 32
         path /usr/lib/swift (offset 12)
Load command 44
          cmd LC_RPATH
      cmdsize 216
         path /Volumes/Xcode.../Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/../../swift-5.5/macosx (offset 12)
Load command 45
          cmd LC_RPATH
      cmdsize 56
         path @executable_path/../lib/swift/macosx (offset 12)

which looks correct to me.

So there are a couple of options:
a) we are not getting the right base paths from swiftc -print-target-info
b) the inferior toolchain is organized differently so the path computation doesn't match up
c) the inferior toolchain doesn't contain the compatibility libs at all

neonichu · 2022-06-22T00:01:18Z

The rpath looks legitimate: /Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/build/buildbot_incremental/toolchain-macosx-x86_64/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/../../swift-5.5/macosx so I think either the layout is different here or we don't have the compatibility libs at all.

neonichu · 2022-06-22T00:16:09Z

OK, toolchain-macosx-x86_64/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.5/macosx does not exist, so we don't have the concurrency compatibility lib on CI.

shahmishal · 2022-06-22T00:38:12Z

swiftlang/swift#59628
@swift-ci please smoke test macOS

shahmishal · 2022-06-22T05:58:21Z

swiftlang/swift#59628
@swift-ci please smoke test macOS

This reverts commit d045aa6.

neonichu requested a review from shahmishal June 21, 2022 17:14

neonichu self-assigned this Jun 21, 2022

neonichu requested review from abertelrud, tomerd and elsh as code owners June 21, 2022 17:14

tomerd approved these changes Jun 21, 2022

View reviewed changes

neonichu force-pushed the do-not-include-swift-libs-in-dyld-library-path branch from 4f2bca3 to 9116d30 Compare June 21, 2022 19:03

neonichu force-pushed the do-not-include-swift-libs-in-dyld-library-path branch from 9116d30 to c3f7692 Compare June 21, 2022 19:53

tomerd reviewed Jun 21, 2022

View reviewed changes

Utilities/bootstrap Outdated Show resolved Hide resolved

neonichu force-pushed the do-not-include-swift-libs-in-dyld-library-path branch from c3f7692 to de4301f Compare June 21, 2022 21:43

neonichu force-pushed the do-not-include-swift-libs-in-dyld-library-path branch from de4301f to 6290e2e Compare June 21, 2022 22:53

neonichu merged commit d045aa6 into main Jun 22, 2022

neonichu deleted the do-not-include-swift-libs-in-dyld-library-path branch June 22, 2022 16:44

This was referenced Jun 22, 2022

[5.7] Do not test inferior Swift libraries on Darwin #5614

Closed

[5.6] Do not test inferior Swift libraries on Darwin #5615

Closed

shahmishal added a commit that referenced this pull request Jun 23, 2022

Revert "Do not test inferior Swift libraries on Darwin (#5611)"

5799193

This reverts commit d045aa6.

shahmishal mentioned this pull request Jun 23, 2022

Revert "Do not test inferior Swift libraries on Darwin" #5617

Merged

atrick pushed a commit that referenced this pull request Jun 23, 2022

Revert "Do not test inferior Swift libraries on Darwin (#5611)" (#5617)

ba596a6

This reverts commit d045aa6.

Do not test inferior Swift libraries on Darwin #5611

Do not test inferior Swift libraries on Darwin #5611

Uh oh!

Conversation

neonichu commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

tomerd commented Jun 21, 2022

Uh oh!

shahmishal commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022

Uh oh!

neonichu commented Jun 21, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

neonichu commented Jun 22, 2022

Uh oh!

neonichu commented Jun 22, 2022

Uh oh!

shahmishal commented Jun 22, 2022

Uh oh!

shahmishal commented Jun 22, 2022

Uh oh!

Uh oh!

neonichu commented Jun 21, 2022 •

edited

Loading