From 3ac2c7b88c0b2f55aa25765a7bcc0438b315d87d Mon Sep 17 00:00:00 2001 From: jsm28 Date: Sat, 29 May 2004 18:40:27 +0000 Subject: [PATCH] * c-typeck.c (common_type): Correct comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82426 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/c-typeck.c | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3573ee2b56c..68b4b5619fc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-05-29 Joseph S. Myers + + * c-typeck.c (common_type): Correct comment. + 2004-05-29 Peter Barada * config/m68k/m68k.c (CONST_METHOD): Add MVZ, MVS. diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index ddc2d0803be..1193f05fe99 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -199,10 +199,13 @@ qualify_type (tree type, tree like) TYPE_QUALS (type) | TYPE_QUALS (like)); } -/* Return the common type of two types. - We assume that comptypes has already been done and returned 1; - if that isn't so, this may crash. In particular, we assume that qualifiers - match. +/* Return the composite type of two compatible types, or the common + type for two arithmetic types under the usual arithmetic + conversions. + + Unless both types are arithmetic types, we assume that comptypes + has already been done and returned 1; if that isn't so, this may + crash. In particular, we assume that qualifiers match. This is the type for the result of most arithmetic operations if the operands have the given two types. */ -- 2.11.0