Skip to content

bpo-30923: Silence fall-through warnings included in -Wextra since gc… #3157

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

Merged
merged 1 commit into from
Aug 21, 2017
Merged

bpo-30923: Silence fall-through warnings included in -Wextra since gc… #3157

merged 1 commit into from
Aug 21, 2017

Conversation

skrah
Copy link
Contributor

@skrah skrah commented Aug 19, 2017

@@ -3614,7 +3614,7 @@ _build_callargs(PyCFuncPtrObject *self, PyObject *argtypes,
case (PARAMFLAG_FIN | PARAMFLAG_FOUT):
*pinoutmask |= (1 << i); /* mark as inout arg */
(*pnumretvals)++;
/* fall through to PARAMFLAG_FIN... */
/* fall through */
Copy link
Member

Choose a reason for hiding this comment

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

Why existing comments are shortened?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

gcc only recognizes "fall through" (and a couple of other versions), but not that comment with additional words.

I only changed comments that aren't recognized.

@@ -4154,6 +4154,7 @@ expr_constant(struct compiler *c, expr_ty e)
else if (o == Py_False)
return 0;
}
/* fall through */
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't be better to move this comment one line up, inside a block, and align it with if and else? And add "else" before "fall through".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed, but gcc doesn't recognize that. It's pretty inflexible.

Copy link
Member

@tiran tiran left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@skrah
Copy link
Contributor Author

skrah commented Aug 21, 2017

Thanks everyone!

@skrah skrah merged commit f432a32 into python:master Aug 21, 2017
@skrah skrah deleted the fallthrough branch August 21, 2017 11:11
@miss-islington
Copy link
Contributor

🐍🍒⛏🤖 Thanks @skrah for the PR, and @skrah for merging it 🌮🎉.I'm working now to backport this PR to: 3.6.

@skrah
Copy link
Contributor Author

skrah commented Sep 6, 2017

Just checking out the bot, this is fantastic.

@Mariatta
Copy link
Member

Mariatta commented Sep 6, 2017

Thanks @skrah Seems like there was problem backporting. I will try this again.

@miss-islington
Copy link
Contributor

🐍🍒⛏🤖 Thanks @skrah for the PR, and @skrah for merging it 🌮🎉.I'm working now to backport this PR to: 3.6.

@miss-islington
Copy link
Contributor

Sorry @skrah and @skrah, I had trouble checking out the backport branch.Please backport using cherry_picker on command line.

@miss-islington
Copy link
Contributor

🐍🍒⛏🤖 Thanks @skrah for the PR, and @skrah for merging it 🌮🎉.I'm working now to backport this PR to: 3.6.

@miss-islington
Copy link
Contributor

Sorry, @skrah and @skrah, I could not cleanly backport this PR due to a conflict.Please backport using cherry_picker on command line.

@skrah
Copy link
Contributor Author

skrah commented Sep 7, 2017

Okay, thanks! I suspected there would be too many conflicts. So let's not backport this, it isn't worth the trouble.

GadgetSteve pushed a commit to GadgetSteve/cpython that referenced this pull request Sep 10, 2017
vstinner added a commit that referenced this pull request Sep 12, 2017
…nce gcc-7.0 (#3518)

* bpo-30923: Disable warning that has been part of -Wextra since gcc-7.0. (#3142)

(cherry picked from commit d73a960)

* bpo-30923: Silence fall-through warnings included in -Wextra since gcc-7.0. (#3157)

(cherry picked from commit f432a32)

* bpo-31275: Small refactoring to silence a fall-through warning. (#3206)

(cherry picked from commit 138753c)
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.

7 participants