From nobody Fri May 27 17:44:19 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B6EA71B5FA24; Fri, 27 May 2022 17:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L8scg4pK7z4ZJf; Fri, 27 May 2022 17:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653673459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5LS0vLsX97Smq1v/3DwdYbzNBkqOag/hD8SF9TYSJls=; b=QOcPlIsieKfcO4fysVrrYX83OaBaozyXz0rCrPjouriuT4BkUchfQ6upvYYiwy8lQHx8I3 xqGBVk8PNtzxyAVeU714kwtGQsqM7gxHkmuf0qs6amOvJiskEtm4Xcw1InMnepnrqpYI2K 1Qj0Vx0ze5TZ0HhKIgJh6vuI3wbWPCuq+jwzM3tVFh5HAbY6Uf2yh0UZUFssjazSJd7vUw 0hgLeTH/ngy8X5HJzhQQVELyqrxu7o9ekuo3uD+mdK50/dFge4JqFA7iGnZP/YI9GEBHLP sSUHBJtWJ4cdOSgdqigB81DqaMXClf4a80SQ2l1LlBzBGuiJDdeKigIV6JfnFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 856FE269F6; Fri, 27 May 2022 17:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24RHiJwa004776; Fri, 27 May 2022 17:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24RHiJNb004775; Fri, 27 May 2022 17:44:19 GMT (envelope-from git) Date: Fri, 27 May 2022 17:44:19 GMT Message-Id: <202205271744.24RHiJNb004775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: eca6e0f7e460 - main - Apply clang fix for assertion failure building webkit2-gtk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eca6e0f7e460bf9a4a6e1bd5198d75168280c88e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653673459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5LS0vLsX97Smq1v/3DwdYbzNBkqOag/hD8SF9TYSJls=; b=O8jK0WeX+VAskU2DAQic4DdT1vz7jbfUCtNe11ol0XnDekLrgPD8QoXkO+u7dh40mnu72y Ip0z/WQw3opismlOOCWq6NuPRztijnyB4bysTnDIl1L76Gv8rsf/KeCvGnWWfoAUgswyfQ RtkgJsoHfp3lPvGiQha7EJZ2unhF4+0KRucYRF4qnzRfVZemONQMgw5vCzHwmzsOk0Bcsg jb4Qs/FuuTQHWNPzJRrXKUpFUU72up6/65V76F62pcKQFBapGDxSQ7IyiC/i+o28nRABKl 5/XSN/L49WhP1G9C2AJ9E+Dz2vXhgBCep02VD7N0X6OCQzD0GNMPbOgLN2qlSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653673459; a=rsa-sha256; cv=none; b=mU6xp82ZO3Nb3Z6/RAhA3wttR2gsyji7Ct/sY7z8VAgY7OPO4KmZsyMvG60yqZoArPyL3h Y4IpJXY72LXmsZSA6H43QFHkzsRmIjrHiLbvq29TK2fRQqlu+r/HLuQBEzHmqJaP+1XuWm Xqkp7HHfDAOn4cXKMCOTC2VK+ExL+3W6RhjVCzTAgmVf1mvAQYLunZPq6/lmWXSaEZ6cbL rAleJfP/DHrpuUA3Swyy2bIIu1Z1psYLxX0jJINBcYoAOTswX908AQkSxaxNwUKjgga+Et mHX/SrPIdmEN1TaVGNd3oPfOfC2YCjbz7Vs+6gzmDWM/f0RcmmLFG2KI3n/uOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=eca6e0f7e460bf9a4a6e1bd5198d75168280c88e commit eca6e0f7e460bf9a4a6e1bd5198d75168280c88e Author: Dimitry Andric AuthorDate: 2022-05-27 17:43:39 +0000 Commit: Dimitry Andric CommitDate: 2022-05-27 17:44:06 +0000 Apply clang fix for assertion failure building webkit2-gtk Merge commit 30baa5d2a450 from llvm git (by Richard Smith): PR45879: Fix assert when constant evaluating union assignment. Consider the form of the first operand of a class assignment not the second operand when implicitly starting the lifetimes of union members. Also add a missing check that the assignment call actually came from a syntactic assignment, not from a direct call to `operator=`. PR: 264280 Reported by: bapt MFC after: 3 days --- contrib/llvm-project/clang/lib/AST/ExprConstant.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp b/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp index e8ceaa6f71ee..6ebf9f6a2578 100644 --- a/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp +++ b/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp @@ -6127,9 +6127,6 @@ static bool HandleFunctionCall(SourceLocation CallLoc, if (!handleTrivialCopy(Info, MD->getParamDecl(0), Args[0], RHSValue, MD->getParent()->isUnion())) return false; - if (Info.getLangOpts().CPlusPlus20 && MD->isTrivial() && - !HandleUnionActiveMemberChange(Info, Args[0], *This)) - return false; if (!handleAssignment(Info, Args[0], *This, MD->getThisType(), RHSValue)) return false; @@ -7641,6 +7638,15 @@ public: if (!EvaluateObjectArgument(Info, Args[0], ThisVal)) return false; This = &ThisVal; + + // If this is syntactically a simple assignment using a trivial + // assignment operator, start the lifetimes of union members as needed, + // per C++20 [class.union]5. + if (Info.getLangOpts().CPlusPlus20 && OCE && + OCE->getOperator() == OO_Equal && MD->isTrivial() && + !HandleUnionActiveMemberChange(Info, Args[0], ThisVal)) + return false; + Args = Args.slice(1); } else if (MD && MD->isLambdaStaticInvoker()) { // Map the static invoker for the lambda back to the call operator.