From nobody Sat Jun 4 12:01:14 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 BD9881B5637A; Sat, 4 Jun 2022 12:01:15 +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 4LFdd62C6Qz4cLS; Sat, 4 Jun 2022 12:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344074; 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=7k5dmbFwh+ID6ca/nl7NdMIIqfxBpNWmtBAgrQBN1yo=; b=ng2L5Hn9yG/9ATn3Sb5U6bQkX3ZPqjZ+DhnRZ1zbPjxaarlTOJjDA7TcW4qKmVl00kex01 HanWIwzLNQqYAH2uKWQRTZHQ5A58E3EHSe7kOP5EHK/dKS6MFIAZXFT7PW2orv8X81wQp2 gMzBbzOXPzhora3ZSJCjE4cQd9EKs7BPgSr1PZGiti1AMFNH54Gli4j29X6+TNXThG6P3R o6JVPZHIDSxRsfv0rcejR8nEF2uD0HdcomD6evn9k3Mjw2BI3kDPL/7rww50Uge7324nIT p98GPB4tAWF3luULOFu1qKXq1WwoLLip8AKoz5q6fu9JBT5iuWoBV8JwRsA6Tw== 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 2B9E41D6D5; Sat, 4 Jun 2022 12:01:14 +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 254C1EIt093708; Sat, 4 Jun 2022 12:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254C1Ew0093707; Sat, 4 Jun 2022 12:01:14 GMT (envelope-from git) Date: Sat, 4 Jun 2022 12:01:14 GMT Message-Id: <202206041201.254C1Ew0093707@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: 8d4cb93316be - stable/13 - Apply fix for asm constraint error in www/php80-opcache 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/13 X-Git-Reftype: branch X-Git-Commit: 8d4cb93316be6e6ce5f8dedb1555c3857b80cdbe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344074; 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=7k5dmbFwh+ID6ca/nl7NdMIIqfxBpNWmtBAgrQBN1yo=; b=GB9oIYSfg7cDWQGxUFXVLI6MCKC6hyR+keVBImwB1KXwZgUU7Pu/6Q4XFDGP6MkLJ/ICky Qe3BBPqJRZHnNOCibAQuwr6Slch1t/yLWg/rV2EXos8nCV6JtneXmbCNSO/WubqIrh+8lc gGXSRDbISMau/lAKUW4dz1G8ONk1akeJrg/c0h6kpksTyrT9NroBKklPBXtx30y3SAZ7cT /S87tLfS7k4G2xFFFhnINQy7GiksaIQDvP7RqQUl+Wz9F4KQK9tN/NqXSKYm9EordhmI+1 V5Cr/5PflN5bw4l6/jNWyRhvrGFyOylkg0Yyw6AX+OamkI0XkhqPKTSTZZ37IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654344074; a=rsa-sha256; cv=none; b=BzyA3QtdIYX8C5EVo9hwPtoir+gRPGDozgf59HXbo26I3Q4UXqYeL5zPXdWotYIvWDpVD+ 9+wTyF/4ZablWXHMKr3bf2VNyEvGWaNoJA+VD2OT39aQvuQSJdTXZJK+g31A+pnrd/2ouN 8Ygxad6HmSBPRID+ceBL66q2HP3+fUnsyKXO0MKKVZdN0/kQLseoSikAfM8+UaJ5hztumN MXrmXKbCypZkL4E8JB3FkdBK8QAM7vlIz1lJ8JYBj6DnxVzabxkeqDngAdN4IlXTyjWQY+ cDjYPrIFfKjsnGVQcS+qMk4VpbOA2ViqCEVudllaFBWnDaTl/r47pzo4IRI02g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8d4cb93316be6e6ce5f8dedb1555c3857b80cdbe commit 8d4cb93316be6e6ce5f8dedb1555c3857b80cdbe Author: Dimitry Andric AuthorDate: 2022-02-17 21:49:39 +0000 Commit: Dimitry Andric CommitDate: 2022-06-04 11:59:37 +0000 Apply fix for asm constraint error in www/php80-opcache Merge commit 027c16bef4b7 from llvm git (by Nick Desaulniers): [X86ISelLowering] permit BlockAddressSDNode "i" constraints for PIC When building 32b x86 code as PIC, the existing handling of "i" constraints is conservative since generally we have to go through the GOT to find references to functions. But generally, BlockAddresses from C code refer to the Function in the current TU. Permit BlockAddresses to be used with the "i" constraint for those cases. I regressed this in commit 4edb9983cb8c ("[SelectionDAG] treat X constrained labels as i for asm") Fixes: https://github.com/llvm/llvm-project/issues/53868 Reviewed By: efriedma, MaskRay Differential Revision: https://reviews.llvm.org/D119905 (cherry picked from commit 8885dff6cec52378084211fdd9366a73833eceee) --- contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp index 9a08586958cd..f21f6107a640 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -54621,8 +54621,9 @@ void X86TargetLowering::LowerAsmOperandForConstraint(SDValue Op, // In any sort of PIC mode addresses need to be computed at runtime by // adding in a register or some sort of table lookup. These can't - // be used as immediates. - if (Subtarget.isPICStyleGOT() || Subtarget.isPICStyleStubPIC()) + // be used as immediates. BlockAddresses are fine though. + if ((Subtarget.isPICStyleGOT() || Subtarget.isPICStyleStubPIC()) && + !isa(Op)) return; // If we are in non-pic codegen mode, we allow the address of a global (with