aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDoug Evans <dje@cygnus.com>1995-04-28 01:52:40 +0000
committerDoug Evans <dje@gnu.org>1995-04-28 01:52:40 +0000
commit2db70b29ac1642e917d70f08922784c03b47eaf7 (patch)
tree5281d9c57c2eec6f4d5c0323d59dda9560dce0e8 /gcc
parent19a0120cb029b036665ebde73bcda0245fa33c52 (diff)
downloadgcc-2db70b29ac1642e917d70f08922784c03b47eaf7.zip
gcc-2db70b29ac1642e917d70f08922784c03b47eaf7.tar.gz
gcc-2db70b29ac1642e917d70f08922784c03b47eaf7.tar.bz2
* typeck.c (common_type): Call lookup_attribute instead of value_member.
From-SVN: r9526
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/typeck.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 20fc5be..f11cf72 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 27 21:49:36 1995 Doug Evans <dje@cygnus.com>
+
+ * typeck.c (common_type): Call lookup_attribute instead of
+ value_member.
+
Tue Apr 25 18:07:43 1995 Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
* Make-lang.in: Change "realclean" to "maintainer-clean".
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 71846da..afdd357 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -286,14 +286,15 @@ common_type (t1, t2)
attributes = a2;
else
{
- /* Pick the longest list, and hang on the other
- list. */
+ /* Pick the longest list, and hang on the other list. */
+ /* ??? For the moment we punt on the issue of attrs with args. */
if (list_length (a1) < list_length (a2))
attributes = a2, a2 = a1;
for (; a2; a2 = TREE_CHAIN (a2))
- if (!value_member (attributes, a2))
+ if (lookup_attribute (IDENTIFIER_POINTER (TREE_PURPOSE (a2)),
+ attributes) == NULL_TREE)
{
a1 = copy_node (a2);
TREE_CHAIN (a1) = attributes;