[5.3][Foundation] Adjust Foundation shims for compatibility #31382

lorentey · 2020-04-28T22:58:49Z

Cherry-picked from #31380.

Adjust stray public import of _SwiftFoundationOverlayShims
Re-add Foundation shims that were removed in [Foundation] Import shims with @implementationOnly #28918. The current version of the Foundation overlay doesn’t use these, but we should still keep them in case a toolchain snapshot build picks up an overlay module from one of the SDKs in Xcode 11.

rdar://62339802

(cherry picked from commit 8f95fab)

The current version of the Foundation overlay doesn’t use these, but we should still keep them in case a toolchain snapshot build picks up on overlay module from one of the SDKs in Xcode 11. rdar://62339802 (cherry picked from commit 057b27b)

lorentey · 2020-04-28T22:59:00Z

@swift-ci test

swift-ci · 2020-04-29T00:00:15Z

Build failed
Swift Test OS X Platform
Git Sha - 9a842f0

lorentey · 2020-04-29T00:46:56Z

Hm, I'm pretty sure this is unrelated.

19:00:06 FAILED: bin/LLDB.framework/Versions/A/LLDB 
...
clang: error: unable to execute command: Bus error: 10

lorentey · 2020-04-29T00:48:19Z

@swift-ci test macOS platform

swift-ci · 2020-04-29T03:14:00Z

Build failed
Swift Test OS X Platform
Git Sha - 9a842f0

lorentey · 2020-04-29T03:17:15Z

¯\(°_o)/¯

20:13:20 ******************** TEST 'lldb-shell :: SwiftREPL/Basic.test' FAILED ********************
20:13:20 Script:
20:13:20 --
20:13:20 : 'RUN: at line 3';   /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/bin/lldb --no-lldbinit -S /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/test/Shell/lit-lldb-init --repl --repl-language swift | /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/llvm-macosx-x86_64/bin/FileCheck /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/llvm-project/lldb/test/Shell/SwiftREPL/Basic.test --check-prefix=SWIFT
20:13:20 : 'RUN: at line 6';   /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/bin/lldb --no-lldbinit -S /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/test/Shell/lit-lldb-init --repl --repl-language c++ 2>&1 | /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/llvm-macosx-x86_64/bin/FileCheck /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/llvm-project/lldb/test/Shell/SwiftREPL/Basic.test --check-prefix=CPP
20:13:20 : 'RUN: at line 9';   not /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/bin/lldb --no-lldbinit -S /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/test/Shell/lit-lldb-init --repl --repl-language patatino 2>&1 | /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/llvm-macosx-x86_64/bin/FileCheck /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/llvm-project/lldb/test/Shell/SwiftREPL/Basic.test   --check-prefix=INVALID
20:13:20 : 'RUN: at line 13';   echo '2 + 3' | /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/bin/lldb --no-lldbinit -S /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/test/Shell/lit-lldb-init --repl | /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/llvm-macosx-x86_64/bin/FileCheck /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/llvm-project/lldb/test/Shell/SwiftREPL/Basic.test --check-prefix=INT
20:13:20 --
20:13:20 Exit Code: 1
20:13:20 
20:13:20 Command Output (stderr):
20:13:20 --
20:13:20 0  lldb                     0x0000000108f17a08 llvm::sys::PrintStackTrace(llvm::raw_ostream&) + 40
20:13:20 1  lldb                     0x0000000108f16cc8 llvm::sys::RunSignalHandlers() + 248
20:13:20 2  lldb                     0x0000000108f182bd SignalHandler(int) + 285
20:13:20 3  libsystem_platform.dylib 0x00007fff735705fd _sigtramp + 29
20:13:20 4  libsystem_platform.dylib 000000000000000000 _sigtramp + 18446603338581080608
20:13:20 5  LLDB                     0x000000010b9dc1b2 lldb_private::SwiftASTContext::CreateInstance(lldb::LanguageType, lldb_private::Module&, lldb_private::Target*, bool) + 7538
20:13:20 6  LLDB                     0x000000010b9e257b CreateTypeSystemInstance(lldb::LanguageType, lldb_private::Module*, lldb_private::Target*, char const*) + 43
20:13:20 7  LLDB                     0x000000010ba1e682 lldb_private::TypeSystemMap::GetTypeSystemForLanguage(lldb::LanguageType, lldb_private::Module*, bool) + 498
20:13:20 8  LLDB                     0x000000010b8d97fe lldb_private::Module::GetTypeSystemForLanguage(lldb::LanguageType) + 30
20:13:20 9  LLDB                     0x000000010ba0013b std::__1::__function::__func<lldb_private::SwiftASTContext::CreateInstance(lldb::LanguageType, lldb_private::Target&, char const*)::$_1, std::__1::allocator<lldb_private::SwiftASTContext::CreateInstance(lldb::LanguageType, lldb_private::Target&, char const*)::$_1>, void ()>::operator()() + 27
20:13:20 10 LLDB                     0x000000010bf2476f void* std::__1::__thread_proxy<std::__1::tuple<std::__1::unique_ptr<std::__1::__thread_struct, std::__1::default_delete<std::__1::__thread_struct> >, llvm::ThreadPool::ThreadPool(unsigned int)::$_0> >(void*) + 735
20:13:20 11 libsystem_pthread.dylib  0x00007fff7357c109 _pthread_start + 148
20:13:20 12 libsystem_pthread.dylib  0x00007fff73577b8b thread_start + 15
20:13:20 
/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/llvm-project/lldb/test/Shell/SwiftREPL/Basic.test:14:9: error: INT: expected string not found in input
20:13:20 // INT: Welcome to {{.*}}Swift
20:13:20         ^
20:13:20 <stdin>:1:1: note: scanning from here
20:13:20 (lldb) command source -s 0 '/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/lldb-macosx-x86_64/test/Shell/lit-lldb-init'
20:13:20 ^
20:13:20 <stdin>:4:104: note: possible intended match here
20:13:20 (lldb) env DYLD_LIBRARY_PATH='/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/swift-macosx-x86_64/lib/swift/macosx' LD_LIBRARY_PATH='/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/swift-macosx-x86_64/lib/swift/x86_64' SIMCTL_CHILD_DYLD_LIBRARY_PATH='/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-release/5.3/buildbot_incremental/swift-macosx-x86_64/lib/swift/macosx'
20:13:20                                                                                                        ^
20:13:20 
20:13:20 --
20:13:20 
20:13:20 ********************

lorentey · 2020-04-29T07:25:58Z

@swift-ci test macOS platform

lorentey added 2 commits April 28, 2020 15:57

[Foundation] Adjust stray public import of _SwiftFoundationOverlayShims

d6b4691

(cherry picked from commit 8f95fab)

lorentey requested review from kylemacomber and edymtt April 28, 2020 22:59

kylemacomber approved these changes Apr 28, 2020

View reviewed changes

theblixguy added the r5.3 label Apr 28, 2020

lorentey merged commit eca272f into swiftlang:release/5.3 Apr 29, 2020

lorentey deleted the shims-shmims-5.3 branch April 29, 2020 17:53

AnthonyLatsis added swift 5.3 🍒 release cherry pick Flag: Release branch cherry picks labels Jan 8, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[5.3][Foundation] Adjust Foundation shims for compatibility #31382

[5.3][Foundation] Adjust Foundation shims for compatibility #31382

Uh oh!

lorentey commented Apr 28, 2020 •

edited

Loading

Uh oh!

lorentey commented Apr 28, 2020

Uh oh!

swift-ci commented Apr 29, 2020

Uh oh!

lorentey commented Apr 29, 2020

Uh oh!

lorentey commented Apr 29, 2020

Uh oh!

swift-ci commented Apr 29, 2020

Uh oh!

lorentey commented Apr 29, 2020 •

edited

Loading

Uh oh!

lorentey commented Apr 29, 2020

Uh oh!

Uh oh!

[5.3][Foundation] Adjust Foundation shims for compatibility #31382

[5.3][Foundation] Adjust Foundation shims for compatibility #31382

Uh oh!

Conversation

lorentey commented Apr 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lorentey commented Apr 28, 2020

Uh oh!

swift-ci commented Apr 29, 2020

Uh oh!

lorentey commented Apr 29, 2020

Uh oh!

lorentey commented Apr 29, 2020

Uh oh!

swift-ci commented Apr 29, 2020

Uh oh!

lorentey commented Apr 29, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lorentey commented Apr 29, 2020

Uh oh!

Uh oh!

lorentey commented Apr 28, 2020 •

edited

Loading

lorentey commented Apr 29, 2020 •

edited

Loading