summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-13 09:58:55 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-13 09:58:55 +0000
commit3ecb65ec71e559f2877aae3f73d878f93073a852 (patch)
treebdf27f82803ff9a102d12fe10a1e14225d617cf6
parentecfe03ce2c5318f2f76acd393f604ed1501cff1c (diff)
downloadppe42-gcc-3ecb65ec71e559f2877aae3f73d878f93073a852.tar.gz
ppe42-gcc-3ecb65ec71e559f2877aae3f73d878f93073a852.zip
* c-typeck.c (convert_for_assignment): Don't allow conversions
between pointers and references. Only allow lvalues to convert to reference. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50731 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-typeck.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de768353572..3c1aaaf1224 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-12 Jason Merrill <jason@redhat.com>
+
+ * c-typeck.c (convert_for_assignment): Don't allow conversions
+ between pointers and references. Only allow lvalues to convert to
+ reference.
+
2002-03-13 Hartmut Penner <hpenner@de.ibm.com>
* config/s390/s390.h (PROFILE_BEFORE_PROLOGUE): Emit profile code
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 0ecc4dbd394..b28466122fa 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -4027,6 +4027,11 @@ convert_for_assignment (type, rhs, errtype, fundecl, funname, parmnum)
if (codel == REFERENCE_TYPE
&& comptypes (TREE_TYPE (type), TREE_TYPE (rhs)) == 1)
{
+ if (!lvalue_p (rhs))
+ {
+ error ("cannot pass rvalue to reference parameter");
+ return error_mark_node;
+ }
if (mark_addressable (rhs) == 0)
return error_mark_node;
rhs = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (rhs)), rhs);
@@ -4146,7 +4151,7 @@ convert_for_assignment (type, rhs, errtype, fundecl, funname, parmnum)
/* Conversions among pointers */
else if ((codel == POINTER_TYPE || codel == REFERENCE_TYPE)
- && (coder == POINTER_TYPE || coder == REFERENCE_TYPE))
+ && (coder == codel))
{
tree ttl = TREE_TYPE (type);
tree ttr = TREE_TYPE (rhstype);
OpenPOWER on IntegriCloud