Skip to content

[Foundation] Adjust Foundation shims for compatibility #31380

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

Merged
merged 2 commits into from
Apr 29, 2020

Conversation

lorentey
Copy link
Member

@lorentey lorentey commented Apr 28, 2020

  • 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

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
@lorentey
Copy link
Member Author

@swift-ci test

@lorentey
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 057b27b

@lorentey
Copy link
Member Author

19:45:39 ******************** TEST 'lldb-shell :: SwiftREPL/OpenClass.test' FAILED ********************
19:45:39 Script:
19:45:39 --
19:45:39 : 'RUN: at line 1';   /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/buildbot_incremental/lldb-macosx-x86_64/bin/lldb --no-lldbinit -S /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/buildbot_incremental/lldb-macosx-x86_64/test/Shell/lit-lldb-init --repl < /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/llvm-project/lldb/test/Shell/SwiftREPL/OpenClass.test 2>&1 | /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/buildbot_incremental/llvm-macosx-x86_64/bin/FileCheck /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/llvm-project/lldb/test/Shell/SwiftREPL/OpenClass.test
19:45:39 --
19:45:39 Exit Code: 1
19:45:39 
19:45:39 Command Output (stderr):
19:45:39 --
19:45:39 
/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/llvm-project/lldb/test/Shell/SwiftREPL/OpenClass.test:12:11: error: CHECK: expected string not found in input
19:45:39 // CHECK: $R0: Foo.X = 0
19:45:39           ^
19:45:39 <stdin>:1:1: note: scanning from here
19:45:39 (lldb) command source -s 0 '/Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master/buildbot_incremental/lldb-macosx-x86_64/test/Shell/lit-lldb-init'
19:45:39 ^
19:45:39 <stdin>:14:134: note: possible intended match here
19:45:39 5 LLDB 0x000000011473cd02 lldb_private::SwiftASTContext::CreateInstance(lldb::LanguageType, lldb_private::Module&, lldb_private::Target*, bool) + 7538
19:45:39                                                                                                                                      ^
19:45:39 
19:45:39 --
19:45:39 
19:45:39 ********************

@lorentey
Copy link
Member Author

@swift-ci test macOS platform

@lorentey lorentey merged commit c8e9ffa into swiftlang:master Apr 29, 2020
@lorentey lorentey deleted the shims-shmims branch April 29, 2020 17:53
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.

2 participants