Skip to content

Cherry-pick FindTypes API modernization #235

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 13 commits into from
Nov 8, 2019

Conversation

adrian-prantl
Copy link

No description provided.

@adrian-prantl
Copy link
Author

@swift-ci test

@fredriss
Copy link

fredriss commented Nov 8, 2019

I think this should go to apple/stable/...

@adrian-prantl
Copy link
Author

You're right, it's not like these cherry-picks actually contain the merge conflict resolutions.

I noticed that SymbolFileDWARFDebugMap::FindTypes was implementing it
incorrectly (passing append=false in a for-loop to recursive calls to
FindTypes would yield only the very last set of results), but instead
of fixing it, removing it seemed like an even better option.

rdar://problem/54412692

Differential Revision: https://reviews.llvm.org/D68171

llvm-svn: 373224
(cherry picked from commit d4d428e)
llvm-svn: 373250
(cherry picked from commit b0ccef1)
This is untested, I don't have access to a Windows machine.

llvm-svn: 373342
(cherry picked from commit 796cd31)
In r368345 I accidentally introduced a regression that would
over-report the number of matches found by FindTypes if the
DeclContext Filter was hit.

This patch simply removes the size_t return parameter altogether —
it's not that useful.

rdar://problem/55500457

Differential Revision: https://reviews.llvm.org/D68169

llvm-svn: 373344
(cherry picked from commit bf9d84c)
llvm-svn: 373352
(cherry picked from commit 771d464)
llvm-svn: 373353
(cherry picked from commit c7f19ca)
llvm-svn: 373354
(cherry picked from commit ad08a5f)
llvm-svn: 373355
(cherry picked from commit dffe5df)
llvm-svn: 373373
(cherry picked from commit f3d2158)
The original test was passing false to the append argument of
FindTypes (the only use of this feature!). This patch now replicates
that by passing a fresh TypeMap into the function where applicable.

llvm-svn: 373409
(cherry picked from commit e2385e0)
llvm-svn: 373968
(cherry picked from commit 69a3b21)
Differential Revision: https://reviews.llvm.org/D68595

llvm-svn: 374080
(cherry picked from commit bde5a6a)
@adrian-prantl adrian-prantl changed the base branch from swift/master to apple/stable/20190619 November 8, 2019 18:56
@adrian-prantl
Copy link
Author

@swift-ci test

@adrian-prantl
Copy link
Author

@swift-ci test

@adrian-prantl adrian-prantl merged commit a28a21b into swiftlang:apple/stable/20190619 Nov 8, 2019
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