Skip to content

[lldb] Fix VALIDATE_AND_RETURN for non-assert build #1489

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 1 commit into from
Jul 17, 2020
Merged

[lldb] Fix VALIDATE_AND_RETURN for non-assert build #1489

merged 1 commit into from
Jul 17, 2020

Conversation

JDevlieghere
Copy link

The call to Equivalent was moved out of the assert and is guarded by

@JDevlieghere
[lldb] Fix VALIDATE_AND_RETURN for non-assert build
ab3f0a4 
The call to Equivalent was moved out of the assert and is guarded by
@JDevlieghere
Copy link
Author

@swift-ci please test

@JDevlieghere
Copy link
Author

I'll create PRs for master-next and master-rebranch once this is green.

@JDevlieghere JDevlieghere merged commit 42c40c5 into swiftlang:swift/master Jul 17, 2020
@JDevlieghere JDevlieghere deleted the infndefndebug branch July 17, 2020 15:07
@JDevlieghere
Copy link
Author

JDevlieghere commented Jul 17, 2020 •
edited
Loading

master-next

To github.com:apple/llvm-project.git
   8acb60d164cc..d5457165d7df  swift/master-next -> swift/master-next

master-rebranch

To github.com:apple/llvm-project.git
   d02593fecbc4..9e8957f9b1fa  swift/master-rebranch -> swift/master-rebranch

adrian-prantl
adrian-prantl reviewed Jul 17, 2020
View reviewed changes
lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp
#define VALIDATE_AND_RETURN(IMPL, REFERENCE, TYPE, ARGS) \
do { \
auto result = IMPL(); \
return result; \
Copy link

Choose a reason for hiding this comment

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

return IMPL();?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrian-prantl adrian-prantl adrian-prantl left review comments

@fredriss fredriss fredriss approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JDevlieghere @adrian-prantl @fredriss