Skip to content

Add DebugPrefixMap remapping back to module creation #23602

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Mar 29, 2019
Merged

Add DebugPrefixMap remapping back to module creation #23602

merged 3 commits into from
Mar 29, 2019

Conversation

DavidGoldman
Copy link
Contributor

@DavidGoldman DavidGoldman commented Mar 27, 2019 •
edited
Loading

@adrian-prantl This was accidentally removed in commit 10004ed.

EDIT: Also would be great to merge this into swift-5.0-branch (minor update) if possible. Thanks!

@DavidGoldman
Add DebugPrefixMap remapping back to module creation
35b47d3 
This was accidentally removed in commit 10004e.
@adrian-prantl
Copy link
Contributor

We'll need to add a testcase for this or else this will break again.

@DavidGoldman
Copy link
Contributor Author

True, I'll try to add one.

@DavidGoldman
Copy link
Contributor Author

DavidGoldman commented Mar 28, 2019 •
edited
Loading

@adrian-prantl done, test added

@adrian-prantl
Copy link
Contributor

Nice. Could you please open a separate PR making the same change on the master branch? There is no automerger from 5.1 -> master.

@DavidGoldman DavidGoldman mentioned this pull request Mar 28, 2019
Merged
@DavidGoldman
Copy link
Contributor Author

Done in #23628

@adrian-prantl
Copy link
Contributor

@swift-ci test and merge

@adrian-prantl
Copy link
Contributor

adrian-prantl commented Mar 29, 2019 •
edited
Loading

Also would be great to merge this into swift-5.0-branch (minor update) if possible. Thanks!

Could you please create a pull request and add me and @fredriss as a reviewer? Again, no promises.

@adrian-prantl
Copy link
Contributor

@swift-ci test and merge

@DavidGoldman DavidGoldman mentioned this pull request Mar 29, 2019
Merged
@DavidGoldman
Copy link
Contributor Author

Looks like it failed due to an unrelated Linux error:

/home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.1-branch/swift-corelibs-foundation/TestFoundation/TestThread.swift:65: error: TestThread.test_threadName : XCTAssertEqual failed: ("Thread2-1") is not equal to ("Thread2-2") - 
/home/buildnode/jenkins/workspace/swift-PR-Linux/branch-swift-5.1-branch/swift-corelibs-foundation/TestFoundation/TestThread.swift:65: error: TestThread.test_threadName : XCTAssertEqual failed: ("Thread2-1") is not equal to ("Thread2-2") - 
Test Case 'TestThread.test_threadName' failed (0.001 seconds)
Test Case 'TestThread.test_mainThread' started at 2019-03-29 18:09:21.529
Test Case 'TestThread.test_mainThread' passed (0.0 seconds)
Test Case 'TestThread.test_callStackSymbols' started at 2019-03-29 18:09:21.529
Test Case 'TestThread.test_callStackSymbols' passed (0.001 seconds)
Test Case 'TestThread.test_callStackReurnAddresses' started at 2019-03-29 18:09:21.530
Test Case 'TestThread.test_callStackReurnAddresses' passed (0.0 seconds)
Test Suite 'TestThread' failed at 2019-03-29 18:09:21.530
	 Executed 6 tests, with 2 failures (0 unexpected) in 0.007 (0.007) seconds

@adrian-prantl
Copy link
Contributor

@swift-ci test and merge

@swift-ci swift-ci merged commit 1b69e55 into swiftlang:swift-5.1-branch Mar 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrian-prantl adrian-prantl adrian-prantl approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DavidGoldman @adrian-prantl @swift-ci