procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/11847 (reference does not work as template argument any more)

Browse source 
PR c++/11847
	* pt.c (convert_nontype_argument): Correct representation of
	REFERENCE_TYPE expressions.

	PR c++/11847
	* g++.dg/template/class1.C: New test.

From-SVN: r71003
This commit is contained in:
Mark Mitchell 2003-09-02 20:54:07 +00:00 • committed by Mark Mitchell
parent 6438456842
commit 3281be05bc
4 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/cp/ChangeLog
View file

@ -1,5 +1,9 @@
2003-09-02 Mark Mitchell <mark@codesourcery.com>
PR c++/11847
* pt.c (convert_nontype_argument): Correct representation of
REFERENCE_TYPE expressions.
PR c++/11808
* cp-tree.h (KOENIG_LOOKUP_P): New macro.
(finish_call_expr): Change prototype.

7
gcc/cp/pt.c
View file

@ -3209,9 +3209,12 @@ convert_nontype_argument (tree type, tree expr)
tree type_referred_to = TREE_TYPE (type);
/* If this expression already has reference type, get the
underling object. */
underlying object. */
if (TREE_CODE (expr_type) == REFERENCE_TYPE)
{
if (TREE_CODE (expr) == NOP_EXPR
&& TREE_CODE (TREE_OPERAND (expr, 0)) == ADDR_EXPR)
STRIP_NOPS (expr);
my_friendly_assert (TREE_CODE (expr) == ADDR_EXPR, 20000604);
expr = TREE_OPERAND (expr, 0);
expr_type = TREE_TYPE (expr);
@ -3265,7 +3268,7 @@ convert_nontype_argument (tree type, tree expr)
}
cxx_mark_addressable (expr);
return build1 (ADDR_EXPR, type, expr);
return build_nop (type, build_address (expr));
}
break;

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2003-09-02 Mark Mitchell <mark@codesourcery.com>
PR c++/11847
* g++.dg/template/class1.C: New test.
PR c++/11808
* g++.dg/expr/call1.C: New test.

9
gcc/testsuite/g++.dg/template/class1.C Normal file
View file

@ -0,0 +1,9 @@
extern const int a;
template <const int&> class X {};
template <typename> struct Y {
X<a> x;
};
template struct Y<int>;