c++: Prevent overwriting arguments when merging duplicates [PR112588]

When merging duplicate instantiations of function templates, currently
read_function_def overwrites the arguments with that of the existing
duplicate. This is problematic, however, since this means that the
PARM_DECLs in the body of the function definition no longer match with
the PARM_DECLs in the argument list, which causes issues when it comes
to generating RTL.

There doesn't seem to be any reason to do this replacement, so this
patch removes that logic.

	PR c++/112588

gcc/cp/ChangeLog:

	* module.cc (trees_in::read_function_def): Don't overwrite
	arguments.

gcc/testsuite/ChangeLog:

	* g++.dg/modules/merge-16.h: New test.
	* g++.dg/modules/merge-16_a.C: New test.
	* g++.dg/modules/merge-16_b.C: New test.

Signed-off-by: Nathaniel Shead <nathanieloshead@gmail.com>
This commit is contained in:
Nathaniel Shead 2023-12-16 21:34:45 +11:00
parent eb71695f76
commit 3471a61ed0
4 changed files with 22 additions and 2 deletions

View file

@ -11703,8 +11703,6 @@ trees_in::read_function_def (tree decl, tree maybe_template)
DECL_RESULT (decl) = result;
DECL_INITIAL (decl) = initial;
DECL_SAVED_TREE (decl) = saved;
if (maybe_dup)
DECL_ARGUMENTS (decl) = DECL_ARGUMENTS (maybe_dup);
if (context)
SET_DECL_FRIEND_CONTEXT (decl, context);

View file

@ -0,0 +1,10 @@
// PR c++/112588
void f(int*);
template <typename T>
struct S {
void g(int n) { f(&n); }
};
template struct S<void>;

View file

@ -0,0 +1,7 @@
// PR c++/112588
// { dg-additional-options "-fmodules-ts" }
// { dg-module-cmi merge16 }
module;
#include "merge-16.h"
export module merge16;

View file

@ -0,0 +1,5 @@
// PR c++/112588
// { dg-additional-options "-fmodules-ts" }
#include "merge-16.h"
import merge16;