[nfc][cxx-interop] Mark lazy member loading complete only after members are loaded. #40336
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zoecarver
commented
Nov 30, 2021
| @@ -989,15 +989,15 @@ void IterableDeclContext::loadAllMembers() const { | |||
| if (!hasLazyMembers()) | |||
| return; | |||
|
|
|||
| // Don't try to load all members re-entrant-ly. | |||
| FirstDeclAndLazyMembers.setInt(false); | |||
There was a problem hiding this comment.
@CodaFi maybe I'm confused about what's going on here, but it seems like this logic is not correct. Shouldn't we mark the members as lazily complete after we load them?
There was a problem hiding this comment.
OK, after investigating some test failures, I see why this is needed now. Otherwise we get into a re-entrant loop where we keep adding the same members.
zoecarver
force-pushed
the
set-lazy-complete-after-load
branch
from
10212a5 to
f3b7a40
Compare
|
I just re-factored this patch so it only touches the clang importer. Sorry for the noise. |
|
@swift-ci please smoke test. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will be slightly more performant because we don't have to walk through all members multiple times (even though we cache all the member lookups).