From: Jason Merrill <jason@yorick.cygnus.com>
Date: Mon, 18 May 1998 04:28:54 +0000 (+0000)
Subject: * call.c (build_over_call): Tweak empty class handling.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=be1559e5b540d31671ce571835299b4bfef28a03;p=gcc.git

* call.c (build_over_call): Tweak empty class handling.

From-SVN: r19833
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6bbfcbf0cec..ef937012497 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 Mon May 18 03:00:57 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
+	* call.c (build_over_call): Tweak empty class handling.
+
 	* decl.c (make_typename_type): Use currently_open_class.
 
 	* class.c (instantiate_type): Don't abort on TREE_NONLOCAL_FLAG.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index b9df085b07b..82397a607b7 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -3394,8 +3394,10 @@ build_over_call (cand, args, flags)
 	  /* Don't copy the padding byte; it might not have been allocated
 	     if to is a base subobject.  */
 	  if (is_empty_class (DECL_CLASS_CONTEXT (fn)))
-	    return build (COMPOUND_EXPR, TREE_TYPE (to),
-			  cp_convert (void_type_node, arg), to);
+	    return build_unary_op
+	      (ADDR_EXPR, build (COMPOUND_EXPR, TREE_TYPE (to),
+				 cp_convert (void_type_node, arg), to),
+	       0);
 
 	  val = build (INIT_EXPR, DECL_CONTEXT (fn), to, arg);
 	  TREE_SIDE_EFFECTS (val) = 1;