 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_101.c,v 1.8 2021/07/04 17:16:09 rillig Exp $	*/
+/*	$NetBSD: msg_101.c,v 1.9 2021/07/04 17:28:06 rillig Exp $	*/
 # 3 "msg_101.c"
 // Test for message: type '%s' does not have member '%s' [101]
 struct point {
 	int x, y;
 };
 void sink(int);
 void
 test(const struct point *ptr, const struct point pt)
+{
 @@ -21,17 +21,16 @@ test(const struct point *ptr, const stru
 	sink(ptr->z);
 	/* expect+1: error: type 'const struct point' does not have member 'z' [101] */
 	sink(pt.z);
 	/* mixed up '.' and '->' */
 	/* expect+1: error: left operand of '.' must be struct or union, not 'pointer to const struct point' [103] */
 	sink(ptr.x);
 	/* expect+1: error: left operand of '->' must be pointer to struct or union, not 'struct point' [104] */
 	sink(pt->x);
 	/* accessing a nonexistent member via the wrong operator */
 	/* expect+1: error: type 'pointer to const struct point' does not have member 'z' [101] */
 	sink(ptr.z);
 	/* FIXME: In cconv, don't set t_const unconditionally to false. */
 	/* expect+1: error: type 'struct point' does not have member 'z' [101] */
 	sink(pt->z);
+}

 @@ -1,6 +1,6 @@
 msg_101.c(21): error: type 'pointer to const struct point' does not have member 'z' [101]
 msg_101.c(23): error: type 'const struct point' does not have member 'z' [101]
 msg_101.c(27): error: left operand of '.' must be struct or union, not 'pointer to const struct point' [103]
 msg_101.c(29): error: left operand of '->' must be pointer to struct or union, not 'struct point' [104]
 msg_101.c(33): error: type 'pointer to const struct point' does not have member 'z' [101]
-msg_101.c(36): error: type 'struct point' does not have member 'z' [101]
+msg_101.c(35): error: type 'struct point' does not have member 'z' [101]

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.311 2021/07/04 17:16:09 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.312 2021/07/04 17:28:05 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.311 2021/07/04 17:16:09 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.312 2021/07/04 17:28:05 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 static	tnode_t	*expr_new_integer_constant(tspec_t, int64_t);
 @@ -718,27 +718,27 @@ cconv(tnode_t *tn)
+	}
 	/*
 	 * Expression of type function (function with return value of type T)
 	 * in rvalue-expression (pointer to function with return value
 	 * of type T)
 	 */
 	if (tn->tn_type->t_tspec == FUNC)
 		tn = build_address(tn, true);
 	/* lvalue to rvalue */
 	if (tn->tn_lvalue) {
 		tp = expr_dup_type(tn->tn_type);
-		/* FIXME: even rvalues can be const/volatile, see msg_101 */
+		/* C99 6.3.2.1p2 sentence 2 says to remove the qualifiers. */
 		tp->t_const = tp->t_volatile = false;
 		tn = new_tnode(LOAD, tp, tn, NULL);
+	}
 	return tn;
+}
 const tnode_t *
 before_conversion(const tnode_t *tn)
+{
 	while (tn->tn_op == CVT && !tn->tn_cast)
 		tn = tn->tn_left;
 	return tn;