Skip to content

Update Swift:master to work with new stable re-branch from swift-5.1-branch #22699

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 30 commits into from
Feb 20, 2019

Conversation

shahmishal
Copy link
Member

We are using this pull request to verify the re-branch of the stable from swift-5.1-branch.

https://forums.swift.org/t/updating-stable-branch-later-next-week-feb-2019/20288

bob-wilson and others added 30 commits February 7, 2019 16:52
LLVM r340675 added a new HermitCore OS type to triples, which broke the
Swift build because it is using -Werror,-Wswitch and the new value was not
handled in swift::getPlatformNameForTriple
The getLocStart API is deprecated and slated for removal from LLVM
very soon. Switch to use getBeginLoc instead. I did not see any uses
of the corresponding getLocEnd API.
It's default-off, but the harness passes -Weverything.  We should
consider whether we should change the print-as-objc output.

rdar://44228136
We need a trailing space after the warning options to separate them from
the following arguments.

rdar://problem/44228136
Update swift's usage of clang::vfs which has been hoisted into LLVM.
The default "[options] <inputs>" text is now up to the caller to provide.
The code in TimerGroup::printJSONValue asserts that the name does not need
to be quoted. Perhaps we can get this fixed, but for now at least, rename
a Timer that has a forward slash in its name.
TerminatorInst has been removed and been made into a regular Instruction.  Use
the `isTerminator` function instead of the dyn_cast.
`ObjC1` has been removed from clang.  Use `ObjC` to detect if Objective-C
language support is enabled.
Update for API changes in clang SVN r345605.
DW_TAG_subprogram has its own flag word now.  Adjust building the debug info.
…20804)

We previously weren't able to import something properly, but now it's
working because of some change in Clang. Let's take it!

rdar://problem/46263312
Check for the DISPFlagDefinition flag instead of "isDefinition: true".
The main different here is that VFS moved from clang to llvm.
CodeGenOptions.h was moved from Frontend to Basic.
The constructor for `DeclRefExpr` now takes a `Context` parameter to avoid the
call to `getASTContext`.  Adjust the invocation accordingly.
We used to represent these just as normal LLVM functions, e.x.:

  declare objc_object* @objc_retain(objc_object*)
  declare void @objc_release(objc_object*)

Recently, special objc intrinsics were added to LLVM. This pass updates these
small (old) passes to use the new intrinsics.

This turned out to not be too difficult since we never create these
instructions. We only analyze them, move them, and delete them.

rdar://47852297
The current radar tracking this disabled test is rdar://problem/47777473
See also the similar change on master-next in
#22484
The expected output needs to be adjusted for differing optimizer behavior.
Tracked by rdar://problem/48056043
The optimizer decided to move casts around.

rdar://48056043
This matches the change in upstream LLDB. I've also aligned the
invocations to improve the readability and make it clear that they're
separate commands executed after each other.

(cherry picked from commit 5b1d826)
…type

The issue was fixed in #19167 so we
no longer need to disable this warning.
rdar://problem/47777548
@swift-ci
Copy link
Contributor

macOS Toolchain
Download Toolchain
Git Sha - 868e794

Install command
tar -zxf swift-PR-22699-207-osx.tar.gz --directory ~/

@shahmishal
Copy link
Member Author

LLDB test failures /cc @fredriss

https://ci.swift.org/job/swift-PR-Linux/11151/

01:13:09.190   Expected Passes    : 1503
01:13:09.190   Unsupported Tests  : 85
01:13:09.190   Unresolved Tests   : 113
01:13:09.190   Unexpected Failures: 29

@shahmishal
Copy link
Member Author

@fredriss
Copy link
Contributor

@dcci was going to look into the Linux failures

@shahmishal
Copy link
Member Author

@shahmishal
Copy link
Member Author

@swiftlang swiftlang deleted a comment from swift-ci Feb 19, 2019
@swift-ci
Copy link
Contributor

!!! Couldn't read commit file !!!

@shahmishal
Copy link
Member Author

@shahmishal
Copy link
Member Author

@swift-ci
Copy link
Contributor

Build failed before running benchmark.

@shahmishal
Copy link
Member Author

@swift-ci
Copy link
Contributor

Build failed before running benchmark.

@shahmishal
Copy link
Member Author

@bob-wilson failed to build in benchmark job

13:14:59 /Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-perf/swift/include/swift/Basic/SourceManager.h:40:49: error: no member named 'Status' in namespace 'clang::vfs'
13:14:59   mutable llvm::DenseMap<StringRef, clang::vfs::Status> StatusCache;
13:14:59                                     ~~~~~~~~~~~~^
13:14:59 /Users/buildnode/jenkins/workspace/swift-PR-osx-smoke-perf/swift/include/swift/Basic/SourceManager.h:53:21: error: no member named 'getRealFileSystem' in namespace 'clang::vfs'; did you mean 'llvm::vfs::getRealFileSystem'?
13:14:59                     clang::vfs::getRealFileSystem())
13:14:59                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13:14:59                     llvm::vfs::getRealFileSystem

@bob-wilson
Copy link
Contributor

I looked at this with Mishal. The benchmark is building master and missing the changes from the Swift PR.

@shahmishal
Copy link
Member Author

@fredriss
Copy link
Contributor

Linux LLDB failures should be fixed by apple/swift-lldb#1310. You might want to update the LLDB PR

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 868e794

@shahmishal
Copy link
Member Author

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 868e794

@shahmishal
Copy link
Member Author

@swiftlang swiftlang deleted a comment from swift-ci Feb 20, 2019
@swiftlang swiftlang deleted a comment from swift-ci Feb 20, 2019
@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 868e794

@shahmishal
Copy link
Member Author

@dcci @fredriss we are almost there!

https://ci.swift.org/job/swift-PR-Linux/11173/

16:28:08 ********************
16:28:08 Unexpected Passing Tests (1):
16:28:08     lldb-Suite :: lang/swift/any/TestSwiftAnyType.py
16:28:08 
16:28:08 ********************
16:28:08 Failing Tests (1):
16:28:08     LLDB :: Reproducer/TestGDBRemoteRepro.test
16:28:08 
16:28:08   Expected Passes    : 1643
16:28:08   Unsupported Tests  : 85
16:28:08   Unexpected Passes  : 1
16:28:08   Unexpected Failures: 1

@dcci
Copy link
Member

dcci commented Feb 20, 2019

@shahmishal you can give it another try, I just merged something new.

@shahmishal
Copy link
Member Author

@shahmishal
Copy link
Member Author

Looks good, we can merge this tomorrow morning.

@shahmishal shahmishal merged commit 345e988 into master Feb 20, 2019
@shahmishal shahmishal deleted the stable-update-5.1 branch January 26, 2023 18:43
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.