From nobody Wed Feb 02 20:56:52 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 6770919A487C; Wed, 2 Feb 2022 20:56:52 +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 4JpvHS2Ltmz4ZtR; Wed, 2 Feb 2022 20:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643835412; 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=J/R8emoEs/ZH64xHoroA6xD6cSma/fdJMQKOcaWu/lg=; b=wJyMekqk6Nn5aAwNgITzS+r6WcYz8ovBXn7vaz37yyAHYL5jAkGKUNR4hfC6VTqMn1mmpV o1z4ihPIb+8ELLqP5acTGTIYSbn6ET3jkVTcZs+FzeTek8xjli7fE4wzoIzAZZFZ7shOFQ 0az5aHfKMfhx9qRB0a/WHLij+KRYdroeb5IYqZ//frgBaKBQt4YU55JYgOZMdh2iqC796y uOCrlQS7H/Km8EdlvdzBOAb9YL0kzsmItxBgCl1u+27hFm1OILvlv/uAnq1JuE1XGRDc2N 4UmBx/+k4rGKbvzuxa/xe2aJckH7NBpGnDFrowdaDyIsmWykpG8IE/nebV7ECQ== 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 27E9E3139; Wed, 2 Feb 2022 20:56:52 +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 212KuqI3018280; Wed, 2 Feb 2022 20:56:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 212Kuqig018279; Wed, 2 Feb 2022 20:56:52 GMT (envelope-from git) Date: Wed, 2 Feb 2022 20:56:52 GMT Message-Id: <202202022056.212Kuqig018279@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: 6e50055f1ad2 - stable/12 - Apply clang fix for assertion failure compiling science/chrono 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: 6e50055f1ad21b5183b357877b68c51e1ee835fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643835412; 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=J/R8emoEs/ZH64xHoroA6xD6cSma/fdJMQKOcaWu/lg=; b=VH1ZYHrXfdhC7AYYTjO7xEcpreMAQeOT/7/H9j+I2vejLLWAoB9OR9aaZ7Rc8KTaeAu965 5K4eCnZrz48rzlASzfcmLtdjUtZptBFsVg1wToLOohS8rQEULIPfBsJT5hk9cuxDsoRDZ+ qlWdTJunfdxnuWB+IRKtP0LXT4LYVmiLxYMEY0jpdjfD8f3pQNsGYKKhrTfYA/pJwPOh5H HMA4qjDMHapcNDZrvyacjpKN0yf52wcfGIznyQowQuo9aOLGZ31PeBdvc6TF3rm07C8YBJ a9balBbGyimu6KW8SnvSO8vURoHZMydG1hDIaQzL+kTUNFIrhTMvGbHlb73njg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643835412; a=rsa-sha256; cv=none; b=VUFtCxcfcaU/OrZ7PixnKAHP2xL8s9gceDx/5t9J4dlcNWUNGF9ybJR95MssHtff16JbbX K8aGaep3C6PfkBatyE6owF0QcPNmA8zjq2h4DESB3/A3xAYdnPWkdOzhj/LRYOgbEm5Aor 6mc+6emGemlWMxrIHYvq9Q2YllDYCFlJnOLqrgBGpm52Q37J1GpVAum/f49rZ8JT36qI2w i+HtcWbkBIR+fUynH4YY5dxw0cj7IwZcSCeqF/IWpSAMwpeFbrsjS+h+JdTkCg2z0fWJGi IAyzHQUhmsc/DuGZrWJ3ymTRkKa1Js8thMqhrnu9WdDC+5/YpF7KKB7yzXBTRQ== 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=6e50055f1ad21b5183b357877b68c51e1ee835fc commit 6e50055f1ad21b5183b357877b68c51e1ee835fc Author: Dimitry Andric AuthorDate: 2022-01-30 20:41:24 +0000 Commit: Dimitry Andric CommitDate: 2022-02-02 20:52:33 +0000 Apply clang fix for assertion failure compiling science/chrono Merge commit 6b0f35931a44 from llvm git (by Jennifer Yu): Fix signal during the call to checkOpenMPLoop. The root problem is a null pointer is accessed during the call to checkOpenMPLoop, because loop up bound expr is an error expression due to error diagnostic was emit early. To fix this, in setLCDeclAndLB, setUB and setStep instead return false, return true when LB, UB or Step contains Error, so that the checking is stopped in checkOpenMPLoop. Differential Revision: https://reviews.llvm.org/D107385 Note this only fixes the assertion reported in bug 261567; some other tweaks for port dependencies are probably still required to make it build to completion. PR: 261567 MFC after: 3 days (cherry picked from commit fdf27841010464ad65c8791077a07000cdb01013) --- contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp b/contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp index c0cd2bf18a77..fc05f040b0d4 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaOpenMP.cpp @@ -7342,7 +7342,7 @@ bool OpenMPIterationSpaceChecker::setLCDeclAndLB(ValueDecl *NewLCDecl, // State consistency checking to ensure correct usage. assert(LCDecl == nullptr && LB == nullptr && LCRef == nullptr && UB == nullptr && Step == nullptr && !TestIsLessOp && !TestIsStrictOp); - if (!NewLCDecl || !NewLB) + if (!NewLCDecl || !NewLB || NewLB->containsErrors()) return true; LCDecl = getCanonicalDecl(NewLCDecl); LCRef = NewLCRefExpr; @@ -7365,7 +7365,7 @@ bool OpenMPIterationSpaceChecker::setUB(Expr *NewUB, // State consistency checking to ensure correct usage. assert(LCDecl != nullptr && LB != nullptr && UB == nullptr && Step == nullptr && !TestIsLessOp && !TestIsStrictOp); - if (!NewUB) + if (!NewUB || NewUB->containsErrors()) return true; UB = NewUB; if (LessOp) @@ -7380,7 +7380,7 @@ bool OpenMPIterationSpaceChecker::setUB(Expr *NewUB, bool OpenMPIterationSpaceChecker::setStep(Expr *NewStep, bool Subtract) { // State consistency checking to ensure correct usage. assert(LCDecl != nullptr && LB != nullptr && Step == nullptr); - if (!NewStep) + if (!NewStep || NewStep->containsErrors()) return true; if (!NewStep->isValueDependent()) { // Check that the step is integer expression.