Skip to content

Recommit #30289 with ASAN fix. #30341

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 2 commits into from
Mar 11, 2020
Merged

Recommit #30289 with ASAN fix. #30341

merged 2 commits into from
Mar 11, 2020

Conversation

gottesmm
Copy link
Contributor

This fixes the logic that was causing ASAN to crash with #30289.

rdar://60262326

gottesmm added 2 commits March 10, 2020 16:52
@gottesmm
Revert "Merge pull request swiftlang#30327 from rintaro/revert-30289"
6b88599 
This reverts commit 0a6ccd8, reversing
changes made to 7c5d74e.
@gottesmm
[semantic-arc-opts] Eliminate unneeded use of bisection that caused A…
7323ea9 
…SAN to fire.

I was being too clever here and in the process of "foot-gunned"
myself. Specifically, I was hoping to use bisection to do some is contained in
list tests. But the list that I actually bisected upon was not the original list
and was just based on the original sorted list! So the pointer comparison for
the bisect no longer worked. Since the bisection was on pointer addresses, if we
were lucky and the new addresses in the new array were sorted the same as the
original array, we wouldn't hit anything.

rdar://60262326
@gottesmm
Copy link
Contributor Author

@swift-ci smoke test

@gottesmm
Copy link
Contributor Author

Going to do the ASAN test once we figure out why the ASAN bot is failing.

@gottesmm
Copy link
Contributor Author

@swift-ci test linux platform

@gottesmm
Copy link
Contributor Author

@swift-ci asan

@gottesmm
Copy link
Contributor Author

@swift-ci test source compatibility

@gottesmm
Copy link
Contributor Author

@swift-ci asan

2 similar comments
@gottesmm
Copy link
Contributor Author

@swift-ci asan

@gottesmm
Copy link
Contributor Author

@swift-ci asan

@gottesmm
Copy link
Contributor Author

@swift-ci asan test

@gottesmm
Copy link
Contributor Author

ASAN failure was this:

00:01:03 ******************** TEST 'Swift(macosx-x86_64) :: Syntax/round_trip_stdlib.swift' FAILED ********************
00:01:03 Script:
00:01:03 --
00:01:03 : 'RUN: at line 1'; '/usr/bin/python' /Users/buildnode/jenkins/workspace/swift-PR-osx-ASAN-test/swift/utils/round-trip-syntax-test -d /Users/buildnode/jenkins/workspace/swift-PR-osx-ASAN-test/swift/stdlib --swift-syntax-test /Users/buildnode/jenkins/workspace/swift-PR-osx-ASAN-test/buildbot_incremental_asan/swift-macosx-x86_64/bin/swift-syntax-test
00:01:03 --
00:01:03 Exit Code: -9
00:01:03 Timeout: Reached timeout of 3000 seconds
00:01:03

I don't think that is me.

@gottesmm gottesmm merged commit 1c1fae3 into swiftlang:master Mar 11, 2020
@gottesmm gottesmm deleted the pr-91997a0048cde708ab0a33c5e524a8c8f9422956 branch March 11, 2020 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@gottesmm