Make fallthrough explicit in tok_parse.c #326
Merged
Conversation
This file contains 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 response to earwig#325
lahwaacz
reviewed
Jul 19, 2024
| @@ -1558,6 +1558,9 @@ Tokenizer_handle_tag_close_close(Tokenizer *self) | |||
| Py_XDECREF(so); | |||
| Py_XDECREF(sc); | |||
| } | |||
| // One of `so` or `sc` failed to allocate so we fall through to clean up the | |||
| // closing tag and propagate the error by returning NULL. | |||
| __attribute__((fallthrough)); | |||
There was a problem hiding this comment.
__attribute__((fallthrough)) is non-standard, IMO it would be better to use [[fallthrough]] if C23 is an option, or just duplicate the two lines below (Py_DECREF and return) to avoid the fallthrough.
There was a problem hiding this comment.
@lahwaacz - __attribute__((fallthrough)) is present in GCC>=7 and LLVM>=8-10 (somewhere in there), so, although non-standard, it should be broadly available. C23 would work for me, but I'm not sure if you want that for your project.
Duplicating the lines seems simplest if you think that's a clean solution.
|
Indeed, we can see this failed in the windows build: https://ci.appveyor.com/project/earwig/mwparserfromhell/builds/50247115/job/viq4v2m66hgv8878
Let’s duplicate the lines as suggested. I don’t think we can move to C23 yet.
|
|
@lahwaacz - I've duplicated the lines. |
|
Thank you! |
|
Thank you! |
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 response to #325. Allows
-Wimplicit-fallthroughto pass.