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: Remove unnecessary Expression temporary in CHCSmtLib2Interface #15967

Merged
merged 1 commit into from
Mar 27, 2025

Conversation

VolodymyrBg
Copy link
Contributor

Remove an unnecessary intermediate Expression variable when populating predicateArgs vector in the invariantsFromSolverResponse method. This simplifies the code by directly using the result of toSMTUtilExpression without storing it in a temporary variable first.

Copy link

Thank you for your contribution to the Solidity compiler! A team member will follow up shortly.

If you haven't read our contributing guidelines and our review checklist before, please do it now, this makes the reviewing process and accepting your contribution smoother.

If you have any questions or need our help, feel free to post them in the PR or talk to us directly on the #solidity-dev channel on Matrix.

blishko
blishko previously approved these changes Mar 26, 2025
// FIXME: Why Expression here?
Expression arg = scopedParser.toSMTUtilExpression(nameSortPair[0]);
predicateArgs.push_back(arg);
predicateArgs.push_back(scopedParser.toSMTUtilExpression(nameSortPair[0]));
Copy link
Member

Choose a reason for hiding this comment

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

Isn't the comment asking why we need to convert this to an Expression in the first place and not simply why we have the local variable? The PR does not seem to address that question and just blindly removes it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Corrected. Thank you for your notice

Copy link
Contributor

Choose a reason for hiding this comment

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

The comment you've inserted instead of the FIXME does not really address the question. I was questioning the original design choice there. I admit the question is poorly phrased and probably should be placed elsewhere.
The question there is why are we even creating the predicate representation as Expression in the first place.

After some thinking, I have an idea how the code can be improved, but it is going to require a larger change.
I suggest to go back to your original change and move the fixme to line 480 with wording "FIXME: Why do we need to represent the predicate as Expression?".
I can take it from there.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@blishko Corrected as you said

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks good!
I think you should squash the commits (only the first one has a meaningful message).
Also, it looks like you should rebase on top latest develop.

Copy link
Member

Choose a reason for hiding this comment

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

You still have a merge commit there. A rebase should get rid of it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cameel like this? there is a file that i didn't edit - test/benchmarks/external.sh

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm confused with rebase every time...

Copy link
Member

Choose a reason for hiding this comment

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

The merge commit is gone so it looks ok. Still not on develop, but now github at least let me use the "Update branch" feature now so it's fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you))

fix: Remove unnecessary Expression temporary in CHCSmtLib2Interface

Update CHCSmtLib2Interface.cpp

Update CHCSmtLib2Interface.cpp

add repeats to external.sh
@cameel cameel enabled auto-merge March 27, 2025 19:09
@cameel cameel merged commit a04f946 into ethereum:develop Mar 27, 2025
74 checks passed
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.

3 participants