From nobody Tue May 31 15:55:48 2022 X-Original-To: dev-commits-src-branches@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 DFB9A1B66E91; Tue, 31 May 2022 15:55:48 +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 4LCH1c5dhSz4fvk; Tue, 31 May 2022 15:55:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654012548; 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=dYy0fRrVk2dW8BiMQ6yg/g3IW+FyNT9FIAmKKZKlt3c=; b=fN+2UTMKpp6IYoYdGLe8gl7xmeyNWorta831xEVfFA9KmbcoUafryWvMAhTAPhU3+XxGuL Tu+2ezxa5p4DtYnY9fnOCNoqPVLP/QVhR0kzfBkJbfR2zHvQ+2p58+EldVei5xGoWO2LJC GAakbQGU6RtIrA5535RmqFkxdwv6VsjLrOhu8LsRc6geCadfqC85p9ATzKt8kl2WyakM0j fIdNYU+GTvPwkmJ0/Q1jQ3KwQNkQm4rx8CDiutZWe8xp368goXDU7RFI7HU+gGcShlysLm erRUgTFWtkjaf8WusUTSwAjZeTAA+xwbHkDCKL0UT3oYrFmu0XW+4RiRbo1x6g== 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 8F8E16B8A; Tue, 31 May 2022 15:55:48 +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 24VFtmhx015535; Tue, 31 May 2022 15:55:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24VFtmUc015534; Tue, 31 May 2022 15:55:48 GMT (envelope-from git) Date: Tue, 31 May 2022 15:55:48 GMT Message-Id: <202205311555.24VFtmUc015534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 42e66f29f5b2 - stable/12 - Apply clang fix for assertion failure building webkit2-gtk List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 42e66f29f5b24297366c60ea5d0c6e3537dd2f21 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654012548; 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=dYy0fRrVk2dW8BiMQ6yg/g3IW+FyNT9FIAmKKZKlt3c=; b=hGlfQr04RYamJNfvievgwx/+Bwn+NtgaKMG2ZtxhhrRWrSxldkE0fKso/9PBgvaMUSgrzI pWhRF75WiA7bL32YLi4VWycHU1F0/g5MuyxF/n8bpajZl3uxNgVRT7ADwgC6FmNopc32VC pVYjuWW31+l//X0MZwbcqf9RgQkHHTJWGooAKOHXL5R6qrxcrbvikAH+zJYaIigmiDVo00 ktTvZ+S2yPJXZEdxXO6FrSubry5+GAzrgIntaQce6BiLNDyTqSuKglBbd2Ow2n/XBIWNjG YF9NaY+rdYvQGndWb5HPlu0SnkGI9QwQVUDESfL/L5S3AbdrJzOKWaPtckXsAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654012548; a=rsa-sha256; cv=none; b=HgCv0pkUOBWSe9vMKH3Idovjz8UlSQnvPOlkDiRA6FfjtXpbDZOfse2XVqHRtiYMOCN/V4 O+CbOVWWJUkKsga6FcpbUqPi7cfxh9trUmYomuXh59j6Ns2SLldmbuROIsWxhFMHds9Cca UAzi5iZCWmZbg8Fj6lFfsOhvk2ejS7uxMpt7LcNh89y0rQDpP6NQdyWUyx+ZQOycQ+ccgP EKLJvU191ky595fdK5KDRjMz+NAddmpnNp8vPklLy4d7boPGiiDrGwTbrwstaaXukPagsW 75gDqkI4igA55SBSLQWG0lpJsBsvU3f/Sy/KCzXRLBr0+mf1Mjm/IZy+m2EDPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=42e66f29f5b24297366c60ea5d0c6e3537dd2f21 commit 42e66f29f5b24297366c60ea5d0c6e3537dd2f21 Author: Dimitry Andric AuthorDate: 2022-05-27 17:43:39 +0000 Commit: Dimitry Andric CommitDate: 2022-05-31 13:16:40 +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 (cherry picked from commit eca6e0f7e460bf9a4a6e1bd5198d75168280c88e) --- 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 ba2865d66e0a..8cdef3c3fa04 100644 --- a/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp +++ b/contrib/llvm-project/clang/lib/AST/ExprConstant.cpp @@ -6097,9 +6097,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; @@ -7611,6 +7608,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.