OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

call.c (reference_binding): Tweak.

Browse Source 
* call.c (reference_binding): Tweak.
	(mayble_handle_implicit_object): Use direct_reference_binding to
	create the right implicit conversion sequence.

From-SVN: r28228
This commit is contained in:
Mark Mitchell 1999-07-23 20:53:54 +00:00 committed by Mark Mitchell
parent ed0e65302b
commit b0385db881
4 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
1999-07-23 Mark Mitchell <mark@codesourcery.com>
* call.c (reference_binding): Tweak.
(mayble_handle_implicit_object): Use direct_reference_binding to
create the right implicit conversion sequence.
1999-07-22 Mark Mitchell <mark@codesourcery.com>
* pt.c (convert_nontype_argument): Don't call decl_constant_value

22
gcc/cp/call.c
View File

@ -1005,9 +1005,6 @@ reference_binding (rto, rfrom, expr, flags)
from = TREE_TYPE (expr);
}
related_p = reference_related_p (to, from);
compatible_p = reference_compatible_p (to, from);
if (TREE_CODE (from) == REFERENCE_TYPE)
{
/* Anything with reference type is an lvalue. */
@ -1017,6 +1014,12 @@ reference_binding (rto, rfrom, expr, flags)
else if (expr)
lvalue_p = real_lvalue_p (expr);
/* Figure out whether or not the types are reference-related and
reference compatible. We have do do this after stripping
references from FROM. */
related_p = reference_related_p (to, from);
compatible_p = reference_compatible_p (to, from);
if (lvalue_p && compatible_p)
{
/* [dcl.init.ref]
@ -3975,15 +3978,20 @@ maybe_handle_implicit_object (ics)
member and cv is the cv-qualification on the member
function declaration. */
tree t = *ics;
tree reference_type;
/* The `this' parameter is a pointer to a class type. Make the
implict conversion talk about a reference to that same class
type. */
reference_type = TREE_TYPE (TREE_TYPE (*ics));
reference_type = build_reference_type (reference_type);
if (TREE_CODE (t) == QUAL_CONV)
t = TREE_OPERAND (t, 0);
if (TREE_CODE (t) == PTR_CONV)
t = TREE_OPERAND (t, 0);
t = build1 (IDENTITY_CONV, TREE_TYPE (TREE_TYPE (t)), NULL_TREE);
t = build_conv (REF_BIND,
build_reference_type (TREE_TYPE (TREE_TYPE (*ics))),
t);
ICS_STD_RANK (t) = ICS_STD_RANK (*ics);
t = direct_reference_binding (reference_type, t);
*ics = t;
}
}

10
gcc/testsuite/g++.old-deja/g++.other/covar1.C Normal file
View File

@ -0,0 +1,10 @@
// Build don't link:
// Origin: Jason Merrill <jason@cygnus.com>
struct A {
virtual A& f();
};
struct B: public A {
B& f();
};

15
gcc/testsuite/g++.old-deja/g++.other/ref2.C Normal file
View File

@ -0,0 +1,15 @@
// Build don't link:
// Origin: Jason Merrill <jason@cygnus.com>
struct A {
int operator * ();
};
struct B : public A { };
int operator * (B &);
int main ()
{
B b;
B& br = b;
*br;
}