From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 17 Dec 2020 17:53:01 +0000 (-0800)
Subject: c++: Fix clang problem [PR 98340]
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2d7a40fa60fb8b9870cfd053a37fc67404353ee2;p=gcc.git

c++: Fix clang problem [PR 98340]

Clang didn't like sizeot (uintset::value) in a templated context.  Not sure
where the problem lies -- ambiguous std, gcc erroneous accept or clang erroneous
reject.  Anyway, this avoids that construct.

	PR c++/98340
	gcc/cp/
	* module.cc (uintset<T>::hash::add): Use uintset (0u).MEMBER,
	rather than uintset::MEMBER.
---

diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc
index 21d04ccec19..b2b81900fc3 100644
--- a/gcc/cp/module.cc
+++ b/gcc/cp/module.cc
@@ -2718,7 +2718,7 @@ uintset<T>::hash::add (typename uintset<T>::hash::key_t key, T value)
 	{
 	  unsigned n = set->num * 2;
 	  size_t new_size = (offsetof (uintset, values)
-			     + sizeof (uintset::values) * n);
+			     + sizeof (uintset (0u).values) * n);
 	  uintset *new_set = new (::operator new (new_size)) uintset (set);
 	  delete set;
 	  set = new_set;
@@ -2743,7 +2743,7 @@ uintset<T>::hash::create (typename uintset<T>::hash::key_t key, unsigned num,
     p2alloc++;
 
   size_t new_size = (offsetof (uintset, values)
-		     + (sizeof (uintset::values) << p2alloc));
+		     + (sizeof (uintset (0u).values) << p2alloc));
   uintset *set = new (::operator new (new_size)) uintset (key);
   set->allocp2 = p2alloc;
   set->num = num;