Skip to content

[lldb] Fix TypeSystemSwiftTypeRe for NDEBUG builds #2419

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 1 commit into from
Feb 3, 2021
Merged

[lldb] Fix TypeSystemSwiftTypeRe for NDEBUG builds #2419

merged 1 commit into from
Feb 3, 2021

Conversation

JDevlieghere
Copy link

No description provided.

@JDevlieghere
Copy link
Author

@swift-ci please test

Copy link

@adrian-prantl adrian-prantl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow. Could you please make sure to cherry-pick this to swift/release/5.4 if applicable?

@@ -2154,11 +2155,11 @@ TypeSystemSwiftTypeRef::GetBitSize(opaque_compiler_type_t type,
return {};
};
FALLBACK(GetBitSize, (ReconstructType(type), exe_scope));
if (exe_scope && exe_scope->CalculateProcess())
if (exe_scope && exe_scope->CalculateProcess()) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is NFC, right? Still a good idea, of course.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, I wasn't sure if the whole VALIDATE_AND_RETURN would get compiled out or not, if not then this is indeed a NO-OP.

@JDevlieghere
Copy link
Author

Could you please make sure to cherry-pick this to swift/release/5.4 if applicable?

The 5.4 branch is fine. I remember fixing something similar last rebranch and I probably just forgot to cherrypick it to swift/next.

@JDevlieghere JDevlieghere merged commit 50c810e into swiftlang:swift/main Feb 3, 2021
@JDevlieghere JDevlieghere deleted the fix-ndebug-builds branch February 3, 2021 21:39
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