Skip to content
Snippets Groups Projects
Commit c9816196 authored by Jakub Jelinek's avatar Jakub Jelinek
Browse files

c++: Fix up [[nodiscard]] on ctors on targetm.cxx.cdtor_returns_this targets [PR99362]

In the P1771R1 changes JeanHeyd reverted part of Alex' PR88146 fix,
but that seems to be incorrect to me.
Where P1771R1 suggests warnings for [[nodiscard]] on constructors is
handled in a different place - in particular the TARGET_EXPR handling
of convert_to_void.  When we have CALL_EXPR of a ctor, on most arches
that call has void return type and so returns early, and on arm where
the ctor returns the this pointer it is undesirable to warn as it warns
about all ctor calls, not just the ones where it should warn.

The P1771R1 changes added a test for this, but as it was given *.c
extension rather than *.C, the test was never run and so this didn't get
spotted immediately.  The test also had a bug, (?n) can't be used
in dg-warning/dg-error because those are implemented by prepending
some regexp before the user provided one and (?n) must come at the start
of the regexp.  Furthermore, while -ftrack-macro-expansion=0 is useful
in one nodiscard test which uses macros, I don't see how it would be
relevant to all the other cpp2a/nodiscard* tests which don't use any
macros.

2021-03-04  Jakub Jelinek  <jakub@redhat.com>

	PR c++/88146
	PR c++/99362
gcc/cp/
	* cvt.c (convert_to_void): Revert 2019-10-17 changes.  Clarify
	comment.
gcc/testsuite/
	* g++.dg/cpp2a/nodiscard-constructor.c: Renamed to ...
	* g++.dg/cpp2a/nodiscard-constructor1.C: ... this.  Remove
	-ftrack-macro-expansion=0 from dg-options.  Don't use (?n) in
	dg-warning regexps, instead replace .* with \[^\n\r]*.
	* g++.dg/cpp2a/nodiscard-constructor2.C: New test.
	* g++.dg/cpp2a/nodiscard-reason-only-one.C: Remove
	-ftrack-macro-expansion=0 from dg-options.
	* g++.dg/cpp2a/nodiscard-reason-nonstring.C: Likewise.
	* g++.dg/cpp2a/nodiscard-once.C: Likewise.
parent a1b56c3e
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment