Skip to content
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

Fix bugzilla 24699 - [REG2.108] No short-circuit evaluation of mixing… #16781

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

dkorpel
Copy link
Contributor

@dkorpel dkorpel commented Aug 13, 2024

… template bool argument

@dlang-bot
Copy link
Contributor

Thanks for your pull request and interest in making D better, @dkorpel! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.
Please verify that your PR follows this checklist:

  • My PR is fully covered with tests (you can see the coverage diff by visiting the details link of the codecov check)
  • My PR is as minimal as possible (smaller, focused PRs are easier to review than big ones)
  • I have provided a detailed rationale explaining my changes
  • New or modified functions have Ddoc comments (with Params: and Returns:)

Please see CONTRIBUTING.md for more information.


If you have addressed all reviews or aren't sure how to proceed, don't hesitate to ping us with a simple comment.

Bugzilla references

Auto-close Bugzilla Severity Description
24699 regression [REG2.108] No short-circuit evaluation of mixing template bool argument

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub run digger -- build "stable + dmd#16781"

@@ -4556,9 +4556,15 @@ extern (C++) class TemplateInstance : ScopeDsymbol

// The arguments are not treated as part of a default argument,
// because they are evaluated at compile time.
const inCondition = !!(sc.flags && SCOPE.condition);
// For master branch: const inCondition = sc.condition;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Kind of annoying that this refactoring isn't in stable yet, does a comment like this help when merging stable @ibuclaw ?

sc = sc.push();
sc.inDefaultArg = false;

// https://issues.dlang.org/show_bug.cgi?id=24699
sc.flags |= SCOPE.condition * inCondition;
Copy link
Contributor

Choose a reason for hiding this comment

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

please write this as if (inCondition) sc.flags |= SCOPE.condition;.
multiplication of bool and flags is just plain confusing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Doesn't really matter, it's just temporary code standing in until the next stable merge

@dlang-bot dlang-bot merged commit 636f4d3 into dlang:stable Aug 14, 2024
73 checks passed
@dkorpel dkorpel deleted the template-condition-regression branch August 14, 2024 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants