From nobody Thu Feb 8 19:20:01 2024 X-Original-To: dev-commits-src-main@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 4TW6J220QQz5BDv4; Thu, 8 Feb 2024 19:20:02 +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 4TW6J21P14z4nN1; Thu, 8 Feb 2024 19:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707420002; 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=9sf5WZdAWRR+waHpCof+g5ywGN+qSNivGez3S8D6wa0=; b=h38EmgLlMaDyEYClIvDlG+lVm8mFGBL2Fa0bdQ6hM1if4e0OLfAblZOwl6FZhi8UPhRSv3 7SDFKSOymcGEXRKjLjohZMARCbQBgcarRjIWyo46SyacOW7QDR80EiJSZcBQT8q/upu5oy Io6yKhI5M1+LBI9zv9UWO5hVxruhvJqH9wSq3TrnH1fyvzm0Bh310Pd6a0XVcw/Q7Xy7me QZvRPQLLuFnlUO46787ghaTqytL91kzWKgBlYAXkl3oB0c9s2kQrkwaSKtosr5AUpMjiiT /x+W1fJz67iGHt28rw9w4s6HugLp71rpkgi5FvAkjzf1aJyEkPiOMxKEDDlpFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707420002; 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=9sf5WZdAWRR+waHpCof+g5ywGN+qSNivGez3S8D6wa0=; b=P+EjQhctdWM6ek/2SUBEa0lRCLTM9uhl+H26qO8/0F0sXaJgoV7iToB77l6HEhCw/rU0bv 4FpXQbv69M246CQtqT3XTe5PazOQ5gBaVmmS3fe370iBugMry43lFCQ4e4RjgqtV0ZAa1e EWEUou8v488LLfN/JV15KfBGYSVLYfYBkgvmypzO4VMzLW6Sn2CAS7JfgVHhddvXl2Olg4 fTfeQEjdqr5EKkN7Z/eBlABTa3+4WC2cUTRCUtnS3QZVK24pvutOdExzRR5umGiX0cP7NW KgZ3Hbv/pGHw5XxraOfKVHUTvDVOBcuuzVFd4omL5PkuZ7DrCxNolLHyVzVbEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707420002; a=rsa-sha256; cv=none; b=hFNhNBwputJk7MmcXwToORHig+q7SDkoX/ZxW2MbSwF/SS6z6sym9hwFM8QAZbw+ItZtGo kEpg/qmqC972d+cAIPnaY21fIlPOjaw49n+jkMZ41a1GIryMpGGx0nch1mBXxkmkYdrcxV i7AcHsMrnq9yL52C5uzeLoceqOz/ID28iakCuhHI1AnLQaSaKSkdEa9HMe1Bx7Zy2I2z0o Z/K0tWdKYJJUCux0LZOhw1Qv1vIkq2r7/WQVHAVpDSb/PYik1ZUuaZpsXyXPB+UtEtMjwN faI5AiKnD6SvQ6OPgOxaX56aZbuujEzA2NuQUA33uzfn2mmFH5Nq14Z+UrZbow== 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 4TW6J20TYjz12k5; Thu, 8 Feb 2024 19:20:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 418JK1pT094700; Thu, 8 Feb 2024 19:20:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 418JK1NU094694; Thu, 8 Feb 2024 19:20:01 GMT (envelope-from git) Date: Thu, 8 Feb 2024 19:20:01 GMT Message-Id: <202402081920.418JK1NU094694@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: cf675768528f - main - Merge commit f577bfb99528 from llvm-project (by Alexander Potapenko): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: cf675768528f22b4a9d8c70897b9ebf51da8061e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=cf675768528f22b4a9d8c70897b9ebf51da8061e commit cf675768528f22b4a9d8c70897b9ebf51da8061e Author: Dimitry Andric AuthorDate: 2024-02-08 19:19:27 +0000 Commit: Dimitry Andric CommitDate: 2024-02-08 19:19:27 +0000 Merge commit f577bfb99528 from llvm-project (by Alexander Potapenko): [sanitizer][msan] fix AArch64 vararg support for KMSAN (#70660) Cast StackSaveAreaPtr, GrRegSaveAreaPtr, VrRegSaveAreaPtr to pointers to fix assertions in getShadowOriginPtrKernel(). Fixes: https://github.com/llvm/llvm-project/issues/69738 Patch by Mark Johnston. Requested by: markj MFC after: 3 days --- .../lib/Transforms/Instrumentation/MemorySanitizer.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp index 83d90049abc3..de266590ad92 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -1718,6 +1718,12 @@ struct MemorySanitizerVisitor : public InstVisitor { std::pair getShadowOriginPtrUserspace(Value *Addr, IRBuilder<> &IRB, Type *ShadowTy, MaybeAlign Alignment) { + VectorType *VectTy = dyn_cast(Addr->getType()); + if (!VectTy) { + assert(Addr->getType()->isPointerTy()); + } else { + assert(VectTy->getElementType()->isPointerTy()); + } Type *IntptrTy = ptrToIntPtrType(Addr->getType()); Value *ShadowOffset = getShadowPtrOffset(Addr, IRB); Value *ShadowLong = ShadowOffset; @@ -5262,21 +5268,25 @@ struct VarArgAArch64Helper : public VarArgHelper { // we need to adjust the offset for both GR and VR fields based on // the __{gr,vr}_offs value (since they are stores based on incoming // named arguments). + Type *RegSaveAreaPtrTy = IRB.getInt8PtrTy(); // Read the stack pointer from the va_list. - Value *StackSaveAreaPtr = getVAField64(IRB, VAListTag, 0); + Value *StackSaveAreaPtr = + IRB.CreateIntToPtr(getVAField64(IRB, VAListTag, 0), RegSaveAreaPtrTy); // Read both the __gr_top and __gr_off and add them up. Value *GrTopSaveAreaPtr = getVAField64(IRB, VAListTag, 8); Value *GrOffSaveArea = getVAField32(IRB, VAListTag, 24); - Value *GrRegSaveAreaPtr = IRB.CreateAdd(GrTopSaveAreaPtr, GrOffSaveArea); + Value *GrRegSaveAreaPtr = IRB.CreateIntToPtr( + IRB.CreateAdd(GrTopSaveAreaPtr, GrOffSaveArea), RegSaveAreaPtrTy); // Read both the __vr_top and __vr_off and add them up. Value *VrTopSaveAreaPtr = getVAField64(IRB, VAListTag, 16); Value *VrOffSaveArea = getVAField32(IRB, VAListTag, 28); - Value *VrRegSaveAreaPtr = IRB.CreateAdd(VrTopSaveAreaPtr, VrOffSaveArea); + Value *VrRegSaveAreaPtr = IRB.CreateIntToPtr( + IRB.CreateAdd(VrTopSaveAreaPtr, VrOffSaveArea), RegSaveAreaPtrTy); // It does not know how many named arguments is being used and, on the // callsite all the arguments were saved. Since __gr_off is defined as