[src/trunk]: src/usr.bin/xlint/lint1 lint: fix typo from previous commit in m...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cae0149385ed
branches:  trunk
changeset: 954241:cae0149385ed
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Apr 02 17:10:52 2021 +0000

description:
lint: fix typo from previous commit in merge_qualifiers

diffstat:

 usr.bin/xlint/lint1/tree.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r b9e4929f696c -r cae0149385ed usr.bin/xlint/lint1/tree.c
--- a/usr.bin/xlint/lint1/tree.c        Fri Apr 02 17:01:39 2021 +0000
+++ b/usr.bin/xlint/lint1/tree.c        Fri Apr 02 17:10:52 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tree.c,v 1.263 2021/04/02 17:01:39 rillig Exp $        */
+/*     $NetBSD: tree.c,v 1.264 2021/04/02 17:10:52 rillig Exp $        */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.263 2021/04/02 17:01:39 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.264 2021/04/02 17:10:52 rillig Exp $");
 #endif
 
 #include <float.h>
@@ -2621,12 +2621,12 @@
        bool v1 = tp1->t_subt->t_volatile;
        bool v2 = tp2->t_subt->t_volatile;
 
-       if (c1 == (c1 | c2) && v2 == (v1 | v2))
+       if (c1 == (c1 | c2) && v1 == (v1 | v2))
                return tp1;
 
        nstp = expr_dup_type(tp1->t_subt);
-       nstp->t_const = c1 | c2;
-       nstp->t_volatile = v1 | v2;
+       nstp->t_const |= c2;
+       nstp->t_volatile |= v2;
 
        ntp = expr_dup_type(tp1);
        ntp->t_subt = nstp;