From 8379916b167de9bebc32401526b6f53d06dca349 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 16 Dec 2020 09:44:38 -0800 Subject: [PATCH] c++: Fix offsetof use [PR 98232] offsetof is underspecified. GCC happened to accept an unneeded explicit scoping, clang does not. gcc/cp/ * module.cc (dumper::push): Clangify offsetof use. --- gcc/cp/module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index d2806966e43..e9ea18636b4 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -4153,7 +4153,7 @@ dumper::push (module_state *m) /* Create or extend the dump implementor. */ unsigned current = dumps ? dumps->stack.length () : 0; unsigned count = current ? current * 2 : EXPERIMENT (1, 20); - size_t alloc = (offsetof (impl, impl::stack) + size_t alloc = (offsetof (impl, stack) + impl::stack_t::embedded_size (count)); dumps = XRESIZEVAR (impl, dumps, alloc); dumps->stack.embedded_init (count, current); -- 2.30.2