Skip to content

Conversation

@xwu
Copy link
Collaborator

@xwu xwu commented Aug 29, 2016

During implementation of SE-0136 in #4041 (restoring MemoryLayout.size(ofValue:) and related methods), a chunk of the diagnostics for MemoryLayout migration interfered with the restored methods and were therefore removed.

Although all functional changes were made in that PR, the diagnostics that remain could use some clean-up to remove unused plumbing. This PR provides that refactoring.

@slavapestov
Copy link
Contributor

@swift-ci Please smoke test

@slavapestov slavapestov self-assigned this Aug 30, 2016
@slavapestov
Copy link
Contributor

Hi @xwu, sorry for losing track of this. Do you mind fixing the merge conflict and pushing a new version I can merge?

@xwu
Copy link
Collaborator Author

xwu commented Oct 25, 2016

@slavapestov Done.

@slavapestov
Copy link
Contributor

@swift-ci Please smoke test and merge

@slavapestov
Copy link
Contributor

@xwu Thank you!

@xwu
Copy link
Collaborator Author

xwu commented Oct 27, 2016

@slavapestov Seems Linux smoke test failed this time, but I can't see the details. One more try?

@slavapestov
Copy link
Contributor

@swift-ci Please smoke test and merge

@slavapestov
Copy link
Contributor

Looks like all builds are failing right now:

b/sanitizer_common/CMakeFiles/RTSanitizerCommon.x86_64.dir/sanitizer_posix.cc.o: In function `__sanitizer::FindAvailableMemoryRange(unsigned long, unsigned long, unsigned long)':
/home/buildnode/disk2/workspace/swift-PR-Linux-smoke-test/branch-master/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_posix.cc:362: multiple definition of `__sanitizer::FindAvailableMemoryRange(unsigned long, unsigned long, unsigned long)'
lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.x86_64.dir/sanitizer_linux.cc.o:/home/buildnode/disk2/workspace/swift-PR-Linux-smoke-test/branch-master/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc:1393: first defined here

@shahmishal Any ideas?

@slavapestov
Copy link
Contributor

@swift-ci Please smoke test and merge

@swift-ci swift-ci merged commit ee07291 into swiftlang:master Oct 27, 2016
@shahmishal
Copy link
Member

@slavapestov This was due to compiler-rt missing one fix, Anna already fixed it.

@erg
Copy link
Contributor

erg commented Oct 27, 2016

This was due to a change that has been fixed.

On Oct 26, 2016, at 6:22 PM, Slava Pestov [email protected] wrote:

Looks like all builds are failing right now:

b/sanitizer_common/CMakeFiles/RTSanitizerCommon.x86_64.dir/sanitizer_posix.cc.o: In function __sanitizer::FindAvailableMemoryRange(unsigned long, unsigned long, unsigned long)': /home/buildnode/disk2/workspace/swift-PR-Linux-smoke-test/branch-master/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_posix.cc:362: multiple definition of__sanitizer::FindAvailableMemoryRange(unsigned long, unsigned long, unsigned long)'
lib/sanitizer_common/CMakeFiles/RTSanitizerCommon.x86_64.dir/sanitizer_linux.cc.o:/home/buildnode/disk2/workspace/swift-PR-Linux-smoke-test/branch-master/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc:1393: first defined here
@shahmishal https://github.com/shahmishal Any ideas?


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub #4541 (comment), or mute the thread https://github.com/notifications/unsubscribe-auth/AABrJt1qF3n_r8VW3FSTtIClO6A6hNVDks5q3_y5gaJpZM4JvHS3.

@xwu xwu deleted the refactor-memory-layout-diagnostic branch October 27, 2016 15:59
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.

5 participants