[qtwebengine] Fix stuff#35639
Merged
BillyONeal merged 2 commits intomicrosoft:masterfrom Dec 14, 2023
Merged
Conversation
jimwang118
added
the
category:port-bug
BillyONeal
reviewed
Dec 13, 2023
Comment on lines
+90
to
+93
| + //RTC_FORCE_INLINE auto operator<<(const std::string& arg) const { | ||
| + // return LogStreamer<Val<CheckArgType::kStdString, const std::string*>>(MakeVal(arg), this); | ||
| + // | ||
| + |
Member
There was a problem hiding this comment.
Suggested change
| + //RTC_FORCE_INLINE auto operator<<(const std::string& arg) const { | |
| + // return LogStreamer<Val<CheckArgType::kStdString, const std::string*>>(MakeVal(arg), this); | |
| + // | |
| + |
Not worth resetting a build of qtwebengine over this
BillyONeal
reviewed
Dec 14, 2023
| }; | ||
|
|
||
| + | ||
| +// Base case: Before the first << argument. |
Member
There was a problem hiding this comment.
Observations:
- Changing the return type to
autoappears OK because the code before was always returning a prvalue and there's no intended SFINAE happening there - The previous code is doing
decltype(MakeVal(an xvalue))while the new code is doingdecltype(MakeVal(an lvalue)). But the runtime code in both cases is calling with an lvalue. - You don't need C++20
remove_cvref_t; template argument deduction will never deduce a ref here, so C++14remove_const_tshould be sufficient. Probably not worth resetting the build over this..
I'm testing to see if just changing decltype(MakeVal(std::declval<U>())) to decltype(MakeVal(std::declval<U&>())) to match the runtime code fixes it
Contributor
Author
There was a problem hiding this comment.
Just remove remove_cvref_t I just used it for testing. Seems like I removed it from the enum test but forgot to remove it from the arithmetic check.
I'm testing to see if just changing decltype(MakeVal(std::declval())) to decltype(MakeVal(std::declval<U&>())) to match the runtime code fixes it
Shouldn't make a difference since the signature of MakeVal is in almost all cases RetType MakeVal(const argtype& x) and that doesn't care about U or U&. However cl is strange from time to time.
Member
There was a problem hiding this comment.
I'm testing to see if just changing decltype(MakeVal(std::declval())) to decltype(MakeVal(std::declval<U&>())) to match the runtime code fixes it
Test failed
BillyONeal
approved these changes
Dec 14, 2023
| }; | ||
|
|
||
| + | ||
| +// Base case: Before the first << argument. |
Member
There was a problem hiding this comment.
I'm testing to see if just changing decltype(MakeVal(std::declval())) to decltype(MakeVal(std::declval<U&>())) to match the runtime code fixes it
Test failed
jimwang118
added
the
info:needs-maintainer-attention
Member
|
I don't think this fixed it. In the CI run of #35640 I'm still seeing: |
Osyotr
pushed a commit
to Osyotr/vcpkg
that referenced
this pull request
Jan 23, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Should fix #35260
Also fixes clang-cl builds