From nobody Sat May 14 11:49:43 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 F186A1ACBB04; Sat, 14 May 2022 11:49:44 +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 4L0kMX3KXMz3rhD; Sat, 14 May 2022 11:49:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652528984; 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=wBj+ruiprpj86Ho4vz4AsTqwI0LiHcmrPSWnQXQ3r+M=; b=t3CL0dj6sv/aHfUV+ezPd6hDumY/hMiqZNhGY+2trUxj2QLz/PNVPo8wR2zha687qMh8Zq BrF0ir4zAonBPg6YV0BD+PbkpNtXWMAJoqqYegmXCLuzdy6zIWfi2UdjibxKYAMhBUEvqM VPb93C2Bf12ZMUVZmBNrY5R1o9uOgSkJ5vtxE1R7flEXapfM/gQi+gsiLOpLKd8Am5RGMB tt3eRutimHPmxHGPQ/okWRqFsl44PT+aPrDuO6kQmatwVANdrj69bDkm/5x2FHUj66gJ7H q432ZbTF2CtI7qZPkOVvIOHHcqVBZebnMrOl8ZWqnsAFZSiZTvP/FgqusEhFUg== 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 A4C4D169D9; Sat, 14 May 2022 11:49:43 +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 24EBnhGY015990; Sat, 14 May 2022 11:49:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24EBnhqW015989; Sat, 14 May 2022 11:49:43 GMT (envelope-from git) Date: Sat, 14 May 2022 11:49:43 GMT Message-Id: <202205141149.24EBnhqW015989@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: 8885dff6cec5 - main - Apply fix for asm constraint error in www/php80-opcache 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: 8885dff6cec52378084211fdd9366a73833eceee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652528984; 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=wBj+ruiprpj86Ho4vz4AsTqwI0LiHcmrPSWnQXQ3r+M=; b=J0fmhkjmxGVtIyBCnBeQXjS49bvA7gjUmfmG/11moCAFMwZmKgO1ZEbwYxyGHNIUbZ1b3R AhEEHcs+bgLpEZeOmp5l9Xtpmqzh+O6AZPvyMQ7i42JnWNq2kS69Ks41QQ+S94MfMlM7gJ kacLXHGV8njCIQmC+Gn8LVMtE8CU0DYzaNkcp/P4F9WmoUenT+fjuUoApZWlXNDgp1ZhPZ Te7GCqcA14oE1R29EawizSDIoOTgwvHZE6d1yCWZWPcnITl8tVaVhXwX9jReZHqIX7aRwO wl/Ec1ocChtzmvHWJ15XPtRNwID3mpf1kiA1dpKbYxafYBtTysDcn/L/ISo6NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652528984; a=rsa-sha256; cv=none; b=mC4O0GdS9TNSk6iF/xvDH26rDNgCYtEHGkpApEbAO3i695lER58Om4/PL7kWkMBGfaEQm+ rWKl8Q+Rzm7Ar6/wJjjzJ/rUq4iri5jUV0S3jfqq/x/9MVjuhHMNO63CJG3zi1DHbrrlDd egC2QwVgAn+zYmbzOSHBWogsYlfslYEWrzpBaR8+OED54U+nnE5MXI7UDn4tGIebdq5k1k HOm/27MOx36hMXsHp80YdVkL58hUhetlNVj5BuIjVR+Uxj5F44y3I6mSVEsQeeH026oQwY UJ7Yi+cQqMXDDxz+YDMEtzuSwOL7lAgAkO+33k8bAen6ASF7GOq2QbXLF/lUIw== 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=8885dff6cec52378084211fdd9366a73833eceee commit 8885dff6cec52378084211fdd9366a73833eceee Author: Dimitry Andric AuthorDate: 2022-02-17 21:49:39 +0000 Commit: Dimitry Andric CommitDate: 2022-05-14 11:45: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 --- 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 90753b5b4d33..824ea7bbc843 100644 --- a/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -54617,8 +54617,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