C front-end: Do not lose comments in type checking #4622
Merged
Conversation
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
In case of declarations and function calls we need to carry over comments from the statement's source location into individual subexpressions as the source location of those subexpressions will be used when generating the goto program instruction.
peterschrammel
approved these changes
May 7, 2019
kroening
approved these changes
May 7, 2019
danielsn
reviewed
May 7, 2019
| @@ -2019,6 +2019,10 @@ void c_typecheck_baset::typecheck_side_effect_function_call( | |||
| throw 0; | |||
| } | |||
|
|
|||
| irep_idt comment = expr.source_location().get_comment(); | |||
| if(!comment.empty() && f_op.source_location().get_comment().empty()) | |||
There was a problem hiding this comment.
If the comment is non empty, should we merge instead of ignoring?
danielsn
reviewed
May 7, 2019
| for(auto &d : declaration.declarators()) | ||
| { | ||
| if(d.source_location().get_comment().empty()) | ||
| d.add_source_location().set_comment(comment); |
There was a problem hiding this comment.
If the comment is non empty, should we merge instead of ignoring?
There was a problem hiding this comment.
The new implementation in #4666 also resolves this problem (in parts by just removing the above code :-) ).
|
I will merge this now, but will also explore a cleaner solution that doesn't abuse comments and instead has dedicated annotations. Then "merging" will actually be possible as the semantics of those annotations can be clearly defined. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In case of declarations and function calls we need to carry over
comments from the statement's source location into individual
subexpressions as the source location of those subexpressions will be
used when generating the goto program instruction.