[llvm] [HWASAN] Use sign extension in memToShadow() and untagPointer() (PR #103727)
Samuel Holland via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 14 02:21:33 PDT 2024
https://github.com/SiFiveHolland created https://github.com/llvm/llvm-project/pull/103727
This allows the shift in untagPointer() to be folded with the shift in memToShadow(), and works for both user and kernel HWASAN. On AArch64, the sequence collapses to a single sbfx instruction, and on RISC-V it avoids consuming a register to hold the shifted mask byte.
This is a backward-compatible change because (for a constant ShadowBase) it only affects the top bits of the pointer returned from memToShadow(), which are ignored by hardware anyway. Note that the AArch64 outline assembly already uses a sbfx instruction for these combined operations.
Additionally use the original tagged pointer to compute the inline tag address, to avoid needing to keep the untagged pointer live.
>From bedf57736dedf32f1f8a502448a605f567f9e868 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel.holland at sifive.com>
Date: Fri, 9 Aug 2024 18:13:31 -0700
Subject: [PATCH] [HWASAN] Use sign extension in memToShadow() and
untagPointer()
This allows the shift in untagPointer() to be folded with the shift in
memToShadow(), and works for both user and kernel HWASAN. On AArch64,
the sequence collapses to a single sbfx instruction, and on RISC-V it
avoids consuming a register to hold the shifted mask byte.
This is a backward-compatible change because (for a constant ShadowBase)
it only affects the top bits of the pointer returned from memToShadow(),
which are ignored by hardware anyway. Note that the AArch64 outline
assembly already uses a sbfx instruction for these combined operations.
Additionally use the original tagged pointer to compute the inline tag
address, to avoid needing to keep the untagged pointer live.
---
llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp | 2 +-
.../Instrumentation/HWAddressSanitizer.cpp | 25 +-
.../CodeGen/RISCV/hwasan-check-memaccess.ll | 2 +-
.../RISCV/alloca-with-calls.ll | 16 +-
.../HWAddressSanitizer/RISCV/alloca.ll | 78 +-
.../HWAddressSanitizer/RISCV/atomic.ll | 6 +-
.../HWAddressSanitizer/RISCV/basic.ll | 1087 +++++++++--------
.../RISCV/exception-lifetime.ll | 25 +-
.../RISCV/use-after-scope-setjmp.ll | 20 +-
.../HWAddressSanitizer/X86/alloca-array.ll | 6 +-
.../X86/alloca-with-calls.ll | 3 +-
.../HWAddressSanitizer/X86/alloca.ll | 63 +-
.../HWAddressSanitizer/X86/basic.ll | 134 +-
.../HWAddressSanitizer/alloca-array.ll | 26 +-
.../HWAddressSanitizer/alloca-compat.ll | 13 +-
.../HWAddressSanitizer/alloca-with-calls.ll | 13 +-
.../HWAddressSanitizer/alloca.ll | 78 +-
.../HWAddressSanitizer/basic.ll | 644 +++++-----
.../HWAddressSanitizer/exception-lifetime.ll | 22 +-
.../HWAddressSanitizer/kernel-alloca.ll | 13 +-
.../HWAddressSanitizer/kernel.ll | 5 +-
.../HWAddressSanitizer/prologue.ll | 91 +-
.../use-after-scope-setjmp.ll | 13 +-
.../HWAddressSanitizer/use-after-scope.ll | 428 ++++---
24 files changed, 1552 insertions(+), 1261 deletions(-)
diff --git a/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp b/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp
index 93677433c04405..005e67f05bce50 100644
--- a/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp
+++ b/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp
@@ -658,7 +658,7 @@ void RISCVAsmPrinter::EmitHwasanMemaccessSymbols(Module &M) {
OutStreamer->emitInstruction(
MCInstBuilder(RISCV::SLLI).addReg(RISCV::X6).addReg(Reg).addImm(8),
MCSTI);
- OutStreamer->emitInstruction(MCInstBuilder(RISCV::SRLI)
+ OutStreamer->emitInstruction(MCInstBuilder(RISCV::SRAI)
.addReg(RISCV::X6)
.addReg(RISCV::X6)
.addImm(12),
diff --git a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
index 95433a216b168d..6495bd76af1834 100644
--- a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
@@ -307,7 +307,6 @@ class HWAddressSanitizer {
struct ShadowTagCheckInfo {
Instruction *TagMismatchTerm = nullptr;
Value *PtrLong = nullptr;
- Value *AddrLong = nullptr;
Value *PtrTag = nullptr;
Value *MemTag = nullptr;
};
@@ -896,7 +895,7 @@ void HWAddressSanitizer::untagPointerOperand(Instruction *I, Value *Addr) {
Value *HWAddressSanitizer::memToShadow(Value *Mem, IRBuilder<> &IRB) {
// Mem >> Scale
- Value *Shadow = IRB.CreateLShr(Mem, Mapping.Scale);
+ Value *Shadow = IRB.CreateAShr(Mem, Mapping.Scale);
if (Mapping.Offset == 0)
return IRB.CreateIntToPtr(Shadow, PtrTy);
// (Mem >> Scale) + Offset
@@ -923,8 +922,8 @@ HWAddressSanitizer::insertShadowTagCheck(Value *Ptr, Instruction *InsertBefore,
R.PtrLong = IRB.CreatePointerCast(Ptr, IntptrTy);
R.PtrTag =
IRB.CreateTrunc(IRB.CreateLShr(R.PtrLong, PointerTagShift), Int8Ty);
- R.AddrLong = untagPointer(IRB, R.PtrLong);
- Value *Shadow = memToShadow(R.AddrLong, IRB);
+ Value *AddrLong = untagPointer(IRB, R.PtrLong);
+ Value *Shadow = memToShadow(AddrLong, IRB);
R.MemTag = IRB.CreateLoad(Int8Ty, Shadow);
Value *TagMismatch = IRB.CreateICmpNE(R.PtrTag, R.MemTag);
@@ -1011,7 +1010,7 @@ void HWAddressSanitizer::instrumentMemAccessInline(Value *Ptr, bool IsWrite,
LI, CheckFailTerm->getParent());
IRB.SetInsertPoint(TCI.TagMismatchTerm);
- Value *InlineTagAddr = IRB.CreateOr(TCI.AddrLong, 15);
+ Value *InlineTagAddr = IRB.CreateOr(TCI.PtrLong, 15);
InlineTagAddr = IRB.CreateIntToPtr(InlineTagAddr, PtrTy);
Value *InlineTag = IRB.CreateLoad(Int8Ty, InlineTagAddr);
Value *InlineTagMismatch = IRB.CreateICmpNE(TCI.PtrTag, InlineTag);
@@ -1255,20 +1254,10 @@ Value *HWAddressSanitizer::tagPointer(IRBuilder<> &IRB, Type *Ty,
// Remove tag from an address.
Value *HWAddressSanitizer::untagPointer(IRBuilder<> &IRB, Value *PtrLong) {
+ unsigned SignExtShift = 64 - PointerTagShift;
assert(!UsePageAliases);
- Value *UntaggedPtrLong;
- if (CompileKernel) {
- // Kernel addresses have 0xFF in the most significant byte.
- UntaggedPtrLong =
- IRB.CreateOr(PtrLong, ConstantInt::get(PtrLong->getType(),
- TagMaskByte << PointerTagShift));
- } else {
- // Userspace addresses have 0x00.
- UntaggedPtrLong = IRB.CreateAnd(
- PtrLong, ConstantInt::get(PtrLong->getType(),
- ~(TagMaskByte << PointerTagShift)));
- }
- return UntaggedPtrLong;
+
+ return IRB.CreateAShr(IRB.CreateShl(PtrLong, SignExtShift), SignExtShift);
}
Value *HWAddressSanitizer::getHwasanThreadSlotPtr(IRBuilder<> &IRB) {
diff --git a/llvm/test/CodeGen/RISCV/hwasan-check-memaccess.ll b/llvm/test/CodeGen/RISCV/hwasan-check-memaccess.ll
index 12c95206d21bed..8a8e73967e78c6 100644
--- a/llvm/test/CodeGen/RISCV/hwasan-check-memaccess.ll
+++ b/llvm/test/CodeGen/RISCV/hwasan-check-memaccess.ll
@@ -26,7 +26,7 @@ declare void @llvm.hwasan.check.memaccess.shortgranules(ptr, ptr, i32)
; CHECK-NEXT: .hidden __hwasan_check_x10_2_short
; CHECK-NEXT: __hwasan_check_x10_2_short:
; CHECK-NEXT: slli t1, a0, 8
-; CHECK-NEXT: srli t1, t1, 12
+; CHECK-NEXT: srai t1, t1, 12
; CHECK-NEXT: add t1, t0, t1
; CHECK-NEXT: lbu t1, 0(t1)
; CHECK-NEXT: srli t2, a0, 56
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/alloca-with-calls.ll b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/alloca-with-calls.ll
index bbfb35549b5b61..f9105010db68bd 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/alloca-with-calls.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/alloca-with-calls.ll
@@ -13,7 +13,8 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-SAME: () #[[ATTR0:[0-9]+]] personality ptr @__hwasan_personality_thunk {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP23:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP23]], 8
; CHECK-NEXT: [[TMP2:%.*]] = ashr i64 [[TMP0]], 3
; CHECK-NEXT: [[TMP3:%.*]] = call ptr @llvm.frameaddress.p0(i32 0)
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
@@ -35,14 +36,16 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[TMP15:%.*]] = call i8 @__hwasan_generate_tag()
; CHECK-NEXT: [[TMP16:%.*]] = zext i8 [[TMP15]] to i64
; CHECK-NEXT: [[TMP17:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP18:%.*]] = and i64 [[TMP17]], 72057594037927935
+; CHECK-NEXT: [[TMP30:%.*]] = shl i64 [[TMP17]], 8
+; CHECK-NEXT: [[TMP18:%.*]] = ashr i64 [[TMP30]], 8
; CHECK-NEXT: [[TMP19:%.*]] = shl i64 [[TMP16]], 56
; CHECK-NEXT: [[TMP20:%.*]] = or i64 [[TMP18]], [[TMP19]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP20]] to ptr
; CHECK-NEXT: [[TMP21:%.*]] = trunc i64 [[TMP16]] to i8
; CHECK-NEXT: [[TMP22:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP23:%.*]] = and i64 [[TMP22]], 72057594037927935
-; CHECK-NEXT: [[TMP24:%.*]] = lshr i64 [[TMP23]], 4
+; CHECK-NEXT: [[TMP35:%.*]] = shl i64 [[TMP22]], 8
+; CHECK-NEXT: [[TMP36:%.*]] = ashr i64 [[TMP35]], 8
+; CHECK-NEXT: [[TMP24:%.*]] = ashr i64 [[TMP36]], 4
; CHECK-NEXT: [[TMP25:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP24]]
; CHECK-NEXT: [[TMP26:%.*]] = getelementptr i8, ptr [[TMP25]], i32 0
; CHECK-NEXT: store i8 4, ptr [[TMP26]], align 1
@@ -51,8 +54,9 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: call void @use32(ptr nonnull [[X_HWASAN]])
; CHECK-NEXT: [[TMP28:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP29:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP30:%.*]] = and i64 [[TMP29]], 72057594037927935
-; CHECK-NEXT: [[TMP31:%.*]] = lshr i64 [[TMP30]], 4
+; CHECK-NEXT: [[TMP33:%.*]] = shl i64 [[TMP29]], 8
+; CHECK-NEXT: [[TMP34:%.*]] = ashr i64 [[TMP33]], 8
+; CHECK-NEXT: [[TMP31:%.*]] = ashr i64 [[TMP34]], 4
; CHECK-NEXT: [[TMP32:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP31]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP32]], i8 [[TMP28]], i64 1, i1 false)
; CHECK-NEXT: ret void
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/alloca.ll b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/alloca.ll
index 23b1043c700165..fb39d0984e2d4a 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/alloca.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/alloca.ll
@@ -45,26 +45,29 @@ define void @test_alloca() sanitize_hwaddress !dbg !15 {
; DYNAMIC-SHADOW-NEXT: #dbg_value(!DIArgList(ptr [[X]], ptr [[X]]), [[META10:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_tag_offset, 0, DW_OP_LLVM_arg, 1, DW_OP_LLVM_tag_offset, 0, DW_OP_plus, DW_OP_deref), [[META12:![0-9]+]])
; DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0, !dbg [[DBG13:![0-9]+]]
; DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = and i64 [[TMP4]], 72057594037927935, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = shl i64 [[TMP3]], 56, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = or i64 [[TMP5]], [[TMP6]], !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP7]] to ptr, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = trunc i64 [[TMP3]] to i8, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP10:%.*]] = and i64 [[TMP9]], 72057594037927935, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP11:%.*]] = lshr i64 [[TMP10]], 4, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP11]], !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = getelementptr i8, ptr [[TMP12]], i32 0, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: store i8 4, ptr [[TMP13]], align 1, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = getelementptr i8, ptr [[X]], i32 15, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: store i8 [[TMP8]], ptr [[TMP14]], align 1, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = shl i64 [[TMP4]], 8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = ashr i64 [[TMP5]], 8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = shl i64 [[TMP3]], 56, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = or i64 [[TMP6]], [[TMP7]], !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP8]] to ptr, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = trunc i64 [[TMP3]] to i8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP10:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP11:%.*]] = shl i64 [[TMP10]], 8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = ashr i64 [[TMP11]], 8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = ashr i64 [[TMP12]], 4, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP13]], !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = getelementptr i8, ptr [[TMP14]], i32 0, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: store i8 4, ptr [[TMP17]], align 1, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP16:%.*]] = getelementptr i8, ptr [[X]], i32 15, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: store i8 [[TMP9]], ptr [[TMP16]], align 1, !dbg [[DBG13]]
; DYNAMIC-SHADOW-NEXT: call void @use32(ptr nonnull [[X_HWASAN]]), !dbg [[DBG13]]
; DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8, !dbg [[DBG14:![0-9]+]]
-; DYNAMIC-SHADOW-NEXT: [[TMP16:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG14]]
-; DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = and i64 [[TMP16]], 72057594037927935, !dbg [[DBG14]]
-; DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = lshr i64 [[TMP17]], 4, !dbg [[DBG14]]
-; DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP18]], !dbg [[DBG14]]
-; DYNAMIC-SHADOW-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP19]], i8 [[TMP15]], i64 1, i1 false), !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = shl i64 [[TMP18]], 8, !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP19]], 8, !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP21:%.*]] = ashr i64 [[TMP20]], 4, !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP22:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP21]], !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP22]], i8 [[TMP15]], i64 1, i1 false), !dbg [[DBG14]]
; DYNAMIC-SHADOW-NEXT: ret void, !dbg [[DBG14]]
;
; ZERO-BASED-SHADOW-LABEL: define void @test_alloca
@@ -80,26 +83,29 @@ define void @test_alloca() sanitize_hwaddress !dbg !15 {
; ZERO-BASED-SHADOW-NEXT: #dbg_value(!DIArgList(ptr [[X]], ptr [[X]]), [[META10:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_tag_offset, 0, DW_OP_LLVM_arg, 1, DW_OP_LLVM_tag_offset, 0, DW_OP_plus, DW_OP_deref), [[META12:![0-9]+]])
; ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0, !dbg [[DBG13:![0-9]+]]
; ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = and i64 [[TMP4]], 72057594037927935, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = shl i64 [[TMP3]], 56, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = or i64 [[TMP5]], [[TMP6]], !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP7]] to ptr, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = trunc i64 [[TMP3]] to i8, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP10:%.*]] = and i64 [[TMP9]], 72057594037927935, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP11:%.*]] = lshr i64 [[TMP10]], 4, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = inttoptr i64 [[TMP11]] to ptr, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = getelementptr i8, ptr [[TMP12]], i32 0, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: store i8 4, ptr [[TMP13]], align 1, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = getelementptr i8, ptr [[X]], i32 15, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: store i8 [[TMP8]], ptr [[TMP14]], align 1, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = shl i64 [[TMP4]], 8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = ashr i64 [[TMP5]], 8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = shl i64 [[TMP3]], 56, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = or i64 [[TMP6]], [[TMP7]], !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP8]] to ptr, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = trunc i64 [[TMP3]] to i8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP10:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP11:%.*]] = shl i64 [[TMP10]], 8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = ashr i64 [[TMP11]], 8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = ashr i64 [[TMP12]], 4, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = inttoptr i64 [[TMP13]] to ptr, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = getelementptr i8, ptr [[TMP14]], i32 0, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: store i8 4, ptr [[TMP17]], align 1, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP16:%.*]] = getelementptr i8, ptr [[X]], i32 15, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: store i8 [[TMP9]], ptr [[TMP16]], align 1, !dbg [[DBG13]]
; ZERO-BASED-SHADOW-NEXT: call void @use32(ptr nonnull [[X_HWASAN]]), !dbg [[DBG13]]
; ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8, !dbg [[DBG14:![0-9]+]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP16:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG14]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = and i64 [[TMP16]], 72057594037927935, !dbg [[DBG14]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = lshr i64 [[TMP17]], 4, !dbg [[DBG14]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = inttoptr i64 [[TMP18]] to ptr, !dbg [[DBG14]]
-; ZERO-BASED-SHADOW-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP19]], i8 [[TMP15]], i64 1, i1 false), !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = shl i64 [[TMP18]], 8, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP19]], 8, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP21:%.*]] = ashr i64 [[TMP20]], 4, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP22:%.*]] = inttoptr i64 [[TMP21]] to ptr, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP22]], i8 [[TMP15]], i64 1, i1 false), !dbg [[DBG14]]
; ZERO-BASED-SHADOW-NEXT: ret void, !dbg [[DBG14]]
;
entry:
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/atomic.ll b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/atomic.ll
index 152d1bfd3288d1..008cecc1d3ef87 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/atomic.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/atomic.ll
@@ -11,7 +11,8 @@ define void @atomicrmw(ptr %ptr) sanitize_hwaddress {
; CHECK-SAME: (ptr [[PTR:%.*]]) #[[ATTR0:[0-9]+]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -30,7 +31,8 @@ define void @cmpxchg(ptr %ptr, i64 %compare_to, i64 %new_value) sanitize_hwaddre
; CHECK-SAME: (ptr [[PTR:%.*]], i64 [[COMPARE_TO:%.*]], i64 [[NEW_VALUE:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/basic.ll b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/basic.ll
index 9cebe2e845f772..45c6630d69b849 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/basic.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/basic.ll
@@ -9,8 +9,6 @@
; RUN: opt < %s -passes=hwasan -hwasan-recover=0 -hwasan-mapping-offset=0 -S | FileCheck %s --check-prefixes=ABORT-ZERO-BASED-SHADOW
; RUN: opt < %s -passes=hwasan -hwasan-recover=1 -hwasan-mapping-offset=0 -S | FileCheck %s --check-prefixes=RECOVER-ZERO-BASED-SHADOW
-; CHECK: @llvm.used = appending global [1 x ptr] [ptr @hwasan.module_ctor]
-; CHECK: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 0, ptr @hwasan.module_ctor, ptr @hwasan.module_ctor }]
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
target triple = "riscv64-unknown-linux"
@@ -20,23 +18,25 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]]) #[[ATTR0:[0-9]+]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP14:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP14]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1:![0-9]+]]
-; CHECK: 12:
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 0)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; CHECK-NEXT: ret i8 [[B]]
;
@@ -44,7 +44,8 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0:[0-9]+]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -56,23 +57,25 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0:[0-9]+]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP14:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP14]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1:![0-9]+]]
-; FASTPATH: 12:
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 0)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; FASTPATH-NEXT: ret i8 [[B]]
;
@@ -83,16 +86,17 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP10:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP10]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1:![0-9]+]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 0)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; ABORT-DYNAMIC-SHADOW-NEXT: ret i8 [[B]]
;
@@ -103,33 +107,34 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP10:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP10]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1:![0-9]+]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 96", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 0
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i8 [[B]]
;
@@ -140,16 +145,17 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP10:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP10]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1:![0-9]+]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 0)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; ABORT-ZERO-BASED-SHADOW-NEXT: ret i8 [[B]]
;
@@ -160,33 +166,34 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP10:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP10]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1:![0-9]+]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 96", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 0
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i8 [[B]]
;
@@ -200,23 +207,25 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 1)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; CHECK-NEXT: ret i16 [[B]]
;
@@ -224,7 +233,8 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -236,23 +246,25 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 1)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; FASTPATH-NEXT: ret i16 [[B]]
;
@@ -263,16 +275,17 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 1)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; ABORT-DYNAMIC-SHADOW-NEXT: ret i16 [[B]]
;
@@ -283,33 +296,34 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 97", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i16 [[B]]
;
@@ -320,16 +334,17 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 1)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; ABORT-ZERO-BASED-SHADOW-NEXT: ret i16 [[B]]
;
@@ -340,33 +355,34 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 97", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i16 [[B]]
;
@@ -380,23 +396,25 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 2)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; CHECK-NEXT: ret i32 [[B]]
;
@@ -404,7 +422,8 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -416,23 +435,25 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 2)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; FASTPATH-NEXT: ret i32 [[B]]
;
@@ -443,16 +464,17 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 2)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; ABORT-DYNAMIC-SHADOW-NEXT: ret i32 [[B]]
;
@@ -463,33 +485,34 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 98", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 3
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i32 [[B]]
;
@@ -500,16 +523,17 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 2)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; ABORT-ZERO-BASED-SHADOW-NEXT: ret i32 [[B]]
;
@@ -520,33 +544,34 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 98", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 3
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i32 [[B]]
;
@@ -560,23 +585,25 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 3)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; CHECK-NEXT: ret i64 [[B]]
;
@@ -584,7 +611,8 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -596,23 +624,25 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 3)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; FASTPATH-NEXT: ret i64 [[B]]
;
@@ -623,16 +653,17 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 3)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; ABORT-DYNAMIC-SHADOW-NEXT: ret i64 [[B]]
;
@@ -643,33 +674,34 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 99", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 7
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i64 [[B]]
;
@@ -680,16 +712,17 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 3)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; ABORT-ZERO-BASED-SHADOW-NEXT: ret i64 [[B]]
;
@@ -700,33 +733,34 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 99", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 7
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i64 [[B]]
;
@@ -740,23 +774,25 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 4)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; CHECK-NEXT: ret i128 [[B]]
;
@@ -764,7 +800,8 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -776,23 +813,25 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 4)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; FASTPATH-NEXT: ret i128 [[B]]
;
@@ -803,16 +842,17 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 4)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; ABORT-DYNAMIC-SHADOW-NEXT: ret i128 [[B]]
;
@@ -823,33 +863,34 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 100", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i128 [[B]]
;
@@ -860,16 +901,17 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 4)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; ABORT-ZERO-BASED-SHADOW-NEXT: ret i128 [[B]]
;
@@ -880,33 +922,34 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 100", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i128 [[B]]
;
@@ -920,7 +963,8 @@ define i40 @test_load40(ptr %a) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -933,7 +977,8 @@ define i40 @test_load40(ptr %a) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -946,7 +991,8 @@ define i40 @test_load40(ptr %a) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1001,23 +1047,25 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]], i8 [[B:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 16)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: store i8 [[B]], ptr [[A]], align 4
; CHECK-NEXT: ret void
;
@@ -1025,7 +1073,8 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]], i8 [[B:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1037,23 +1086,25 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]], i8 [[B:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 16)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: store i8 [[B]], ptr [[A]], align 4
; FASTPATH-NEXT: ret void
;
@@ -1064,16 +1115,17 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 16)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: store i8 [[B]], ptr [[A]], align 4
; ABORT-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1084,33 +1136,34 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 112", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 0
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i8 [[B]], ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1121,16 +1174,17 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 16)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: store i8 [[B]], ptr [[A]], align 4
; ABORT-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1141,33 +1195,34 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 112", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 0
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i8 [[B]], ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1181,23 +1236,25 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]], i16 [[B:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 17)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: store i16 [[B]], ptr [[A]], align 4
; CHECK-NEXT: ret void
;
@@ -1205,7 +1262,8 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]], i16 [[B:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1217,23 +1275,25 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]], i16 [[B:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 17)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: store i16 [[B]], ptr [[A]], align 4
; FASTPATH-NEXT: ret void
;
@@ -1244,16 +1304,17 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 17)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: store i16 [[B]], ptr [[A]], align 4
; ABORT-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1264,33 +1325,34 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 113", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i16 [[B]], ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1301,16 +1363,17 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 17)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: store i16 [[B]], ptr [[A]], align 4
; ABORT-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1321,33 +1384,34 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 113", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i16 [[B]], ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1361,23 +1425,25 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]], i32 [[B:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 18)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: store i32 [[B]], ptr [[A]], align 4
; CHECK-NEXT: ret void
;
@@ -1385,7 +1451,8 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]], i32 [[B:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1397,23 +1464,25 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]], i32 [[B:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 18)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: store i32 [[B]], ptr [[A]], align 4
; FASTPATH-NEXT: ret void
;
@@ -1424,16 +1493,17 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 18)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: store i32 [[B]], ptr [[A]], align 4
; ABORT-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1444,33 +1514,34 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 114", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 3
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i32 [[B]], ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1481,16 +1552,17 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 18)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: store i32 [[B]], ptr [[A]], align 4
; ABORT-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1501,33 +1573,34 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 114", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 3
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i32 [[B]], ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1541,23 +1614,25 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]], i64 [[B:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 19)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: store i64 [[B]], ptr [[A]], align 8
; CHECK-NEXT: ret void
;
@@ -1565,7 +1640,8 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]], i64 [[B:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1577,23 +1653,25 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]], i64 [[B:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 19)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: store i64 [[B]], ptr [[A]], align 8
; FASTPATH-NEXT: ret void
;
@@ -1604,16 +1682,17 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 19)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: store i64 [[B]], ptr [[A]], align 8
; ABORT-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1624,33 +1703,34 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 115", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 7
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i64 [[B]], ptr [[A]], align 8
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1661,16 +1741,17 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 19)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: store i64 [[B]], ptr [[A]], align 8
; ABORT-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1681,33 +1762,34 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 115", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 7
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i64 [[B]], ptr [[A]], align 8
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1721,23 +1803,25 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]], i128 [[B:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; CHECK-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; CHECK-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; CHECK-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; CHECK-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; CHECK-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; CHECK: 12:
+; CHECK-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; CHECK: 14:
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 20)
; CHECK-NEXT: br label [[TMP13]]
-; CHECK: 13:
+; CHECK: 15:
; CHECK-NEXT: store i128 [[B]], ptr [[A]], align 16
; CHECK-NEXT: ret void
;
@@ -1745,7 +1829,8 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]], i128 [[B:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP4:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP4]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1757,23 +1842,25 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]], i128 [[B:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; FASTPATH-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 56
; FASTPATH-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; FASTPATH-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], 72057594037927935
-; FASTPATH-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; FASTPATH-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 8
+; FASTPATH-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP12]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP15]], 4
; FASTPATH-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; FASTPATH-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; FASTPATH-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
-; FASTPATH: 12:
+; FASTPATH-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP13:%.*]], !prof [[PROF1]]
+; FASTPATH: 14:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP3]], ptr [[A]], i32 20)
; FASTPATH-NEXT: br label [[TMP13]]
-; FASTPATH: 13:
+; FASTPATH: 15:
; FASTPATH-NEXT: store i128 [[B]], ptr [[A]], align 16
; FASTPATH-NEXT: ret void
;
@@ -1784,16 +1871,17 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-DYNAMIC-SHADOW: 8:
+; ABORT-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-DYNAMIC-SHADOW: 9:
; ABORT-DYNAMIC-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 20)
; ABORT-DYNAMIC-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-DYNAMIC-SHADOW: 9:
+; ABORT-DYNAMIC-SHADOW: 10:
; ABORT-DYNAMIC-SHADOW-NEXT: store i128 [[B]], ptr [[A]], align 16
; ABORT-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1804,33 +1892,34 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 116", "{x10}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i128 [[B]], ptr [[A]], align 16
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1841,16 +1930,17 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; ABORT-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; ABORT-ZERO-BASED-SHADOW: 8:
+; ABORT-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; ABORT-ZERO-BASED-SHADOW: 9:
; ABORT-ZERO-BASED-SHADOW-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 20)
; ABORT-ZERO-BASED-SHADOW-NEXT: br label [[TMP9]]
-; ABORT-ZERO-BASED-SHADOW: 9:
+; ABORT-ZERO-BASED-SHADOW: 10:
; ABORT-ZERO-BASED-SHADOW-NEXT: store i128 [[B]], ptr [[A]], align 16
; ABORT-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1861,33 +1951,34 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "ebreak\0Aaddiw x0, x11, 116", "{x10}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i128 [[B]], ptr [[A]], align 16
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1901,7 +1992,8 @@ define void @test_store40(ptr %a, i40 %b) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]], i40 [[B:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1914,7 +2006,8 @@ define void @test_store40(ptr %a, i40 %b) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]], i40 [[B:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1927,7 +2020,8 @@ define void @test_store40(ptr %a, i40 %b) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]], i40 [[B:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1982,7 +2076,8 @@ define void @test_store_unaligned(ptr %a, i64 %b) sanitize_hwaddress {
; CHECK-SAME: (ptr [[A:%.*]], i64 [[B:%.*]]) #[[ATTR0]] {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; CHECK-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; CHECK-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -1995,7 +2090,8 @@ define void @test_store_unaligned(ptr %a, i64 %b) sanitize_hwaddress {
; NOFASTPATH-SAME: (ptr [[A:%.*]], i64 [[B:%.*]]) #[[ATTR0]] {
; NOFASTPATH-NEXT: entry:
; NOFASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; NOFASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; NOFASTPATH-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; NOFASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; NOFASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; NOFASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; NOFASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -2008,7 +2104,8 @@ define void @test_store_unaligned(ptr %a, i64 %b) sanitize_hwaddress {
; FASTPATH-SAME: (ptr [[A:%.*]], i64 [[B:%.*]]) #[[ATTR0]] {
; FASTPATH-NEXT: entry:
; FASTPATH-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; FASTPATH-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; FASTPATH-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 8
; FASTPATH-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; FASTPATH-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; FASTPATH-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/exception-lifetime.ll b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/exception-lifetime.ll
index dda9a70a7cecaf..c6a8f54e5729a5 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/exception-lifetime.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/exception-lifetime.ll
@@ -19,7 +19,8 @@ define void @test() sanitize_hwaddress personality ptr @__gxx_personality_v0 {
; CHECK-SAME: () #[[ATTR0:[0-9]+]] personality ptr @__hwasan_personality_thunk.__gxx_personality_v0 {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP22:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP22]], 8
; CHECK-NEXT: [[TMP2:%.*]] = ashr i64 [[TMP0]], 3
; CHECK-NEXT: [[TMP3:%.*]] = call ptr @llvm.frameaddress.p0(i32 0)
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
@@ -40,7 +41,8 @@ define void @test() sanitize_hwaddress personality ptr @__gxx_personality_v0 {
; CHECK-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; CHECK-NEXT: [[TMP15:%.*]] = xor i64 [[TMP2]], 0
; CHECK-NEXT: [[TMP16:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP17:%.*]] = and i64 [[TMP16]], 72057594037927935
+; CHECK-NEXT: [[TMP29:%.*]] = shl i64 [[TMP16]], 8
+; CHECK-NEXT: [[TMP17:%.*]] = ashr i64 [[TMP29]], 8
; CHECK-NEXT: [[TMP18:%.*]] = shl i64 [[TMP15]], 56
; CHECK-NEXT: [[TMP19:%.*]] = or i64 [[TMP17]], [[TMP18]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP19]] to ptr
@@ -49,27 +51,29 @@ define void @test() sanitize_hwaddress personality ptr @__gxx_personality_v0 {
; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr [[X]])
; CHECK-NEXT: [[TMP20:%.*]] = trunc i64 [[TMP15]] to i8
; CHECK-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
-; CHECK-NEXT: [[TMP23:%.*]] = lshr i64 [[TMP22]], 4
+; CHECK-NEXT: [[TMP37:%.*]] = shl i64 [[TMP21]], 8
+; CHECK-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP37]], 8
+; CHECK-NEXT: [[TMP23:%.*]] = ashr i64 [[TMP40]], 4
; CHECK-NEXT: [[TMP24:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP23]]
; CHECK-NEXT: [[TMP25:%.*]] = getelementptr i8, ptr [[TMP24]], i32 0
; CHECK-NEXT: store i8 4, ptr [[TMP25]], align 1
; CHECK-NEXT: [[TMP26:%.*]] = getelementptr i8, ptr [[X]], i32 15
; CHECK-NEXT: store i8 [[TMP20]], ptr [[TMP26]], align 1
; CHECK-NEXT: invoke void @mayFail(ptr [[X_HWASAN]])
-; CHECK-NEXT: to label [[INVOKE_CONT:%.*]] unwind label [[LPAD:%.*]]
+; CHECK-NEXT: to label [[INVOKE_CONT:%.*]] unwind label [[LPAD:%.*]]
; CHECK: invoke.cont:
; CHECK-NEXT: [[TMP27:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP28:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP29:%.*]] = and i64 [[TMP28]], 72057594037927935
-; CHECK-NEXT: [[TMP30:%.*]] = lshr i64 [[TMP29]], 4
+; CHECK-NEXT: [[TMP43:%.*]] = shl i64 [[TMP28]], 8
+; CHECK-NEXT: [[TMP44:%.*]] = ashr i64 [[TMP43]], 8
+; CHECK-NEXT: [[TMP30:%.*]] = ashr i64 [[TMP44]], 4
; CHECK-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP30]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP31]], i8 [[TMP27]], i64 1, i1 false)
; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr [[X]])
; CHECK-NEXT: ret void
; CHECK: lpad:
; CHECK-NEXT: [[TMP32:%.*]] = landingpad { ptr, i32 }
-; CHECK-NEXT: cleanup
+; CHECK-NEXT: cleanup
; CHECK-NEXT: [[TMP33:%.*]] = extractvalue { ptr, i32 } [[TMP32]], 0
; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP14]], ptr [[EXN_SLOT]], i32 19)
; CHECK-NEXT: store ptr [[TMP33]], ptr [[EXN_SLOT]], align 8
@@ -79,8 +83,9 @@ define void @test() sanitize_hwaddress personality ptr @__gxx_personality_v0 {
; CHECK-NEXT: call void @onExcept(ptr [[X_HWASAN]])
; CHECK-NEXT: [[TMP35:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP36:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP37:%.*]] = and i64 [[TMP36]], 72057594037927935
-; CHECK-NEXT: [[TMP38:%.*]] = lshr i64 [[TMP37]], 4
+; CHECK-NEXT: [[TMP41:%.*]] = shl i64 [[TMP36]], 8
+; CHECK-NEXT: [[TMP42:%.*]] = ashr i64 [[TMP41]], 8
+; CHECK-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP42]], 4
; CHECK-NEXT: [[TMP39:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP38]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP39]], i8 [[TMP35]], i64 1, i1 false)
; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr [[X]])
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/use-after-scope-setjmp.ll b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/use-after-scope-setjmp.ll
index db78c1f05b0df5..3e041b35e86378 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/use-after-scope-setjmp.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/RISCV/use-after-scope-setjmp.ll
@@ -13,7 +13,8 @@ define dso_local noundef i1 @_Z6targetv() sanitize_hwaddress {
; CHECK-SAME: () #[[ATTR0:[0-9]+]] personality ptr @__hwasan_personality_thunk {
; CHECK-NEXT: entry:
; CHECK-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; CHECK-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], 72057594037927935
+; CHECK-NEXT: [[TMP22:%.*]] = shl i64 [[TMP0]], 8
+; CHECK-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP22]], 8
; CHECK-NEXT: [[TMP2:%.*]] = ashr i64 [[TMP0]], 3
; CHECK-NEXT: [[TMP3:%.*]] = call ptr @llvm.frameaddress.p0(i32 0)
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
@@ -34,20 +35,22 @@ define dso_local noundef i1 @_Z6targetv() sanitize_hwaddress {
; CHECK-NEXT: [[BUF:%.*]] = alloca [4096 x i8], align 16
; CHECK-NEXT: [[TMP15:%.*]] = xor i64 [[TMP2]], 0
; CHECK-NEXT: [[TMP16:%.*]] = ptrtoint ptr [[BUF]] to i64
-; CHECK-NEXT: [[TMP17:%.*]] = and i64 [[TMP16]], 72057594037927935
+; CHECK-NEXT: [[TMP27:%.*]] = shl i64 [[TMP16]], 8
+; CHECK-NEXT: [[TMP17:%.*]] = ashr i64 [[TMP27]], 8
; CHECK-NEXT: [[TMP18:%.*]] = shl i64 [[TMP15]], 56
; CHECK-NEXT: [[TMP19:%.*]] = or i64 [[TMP17]], [[TMP18]]
; CHECK-NEXT: [[BUF_HWASAN:%.*]] = inttoptr i64 [[TMP19]] to ptr
; CHECK-NEXT: [[TMP20:%.*]] = trunc i64 [[TMP15]] to i8
; CHECK-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[BUF]] to i64
-; CHECK-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
-; CHECK-NEXT: [[TMP23:%.*]] = lshr i64 [[TMP22]], 4
+; CHECK-NEXT: [[TMP32:%.*]] = shl i64 [[TMP21]], 8
+; CHECK-NEXT: [[TMP33:%.*]] = ashr i64 [[TMP32]], 8
+; CHECK-NEXT: [[TMP23:%.*]] = ashr i64 [[TMP33]], 4
; CHECK-NEXT: [[TMP24:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP23]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP24]], i8 [[TMP20]], i64 256, i1 false)
; CHECK-NEXT: [[CALL:%.*]] = call i32 @setjmp(ptr noundef @jbuf)
; CHECK-NEXT: switch i32 [[CALL]], label [[WHILE_BODY:%.*]] [
-; CHECK-NEXT: i32 1, label [[RETURN:%.*]]
-; CHECK-NEXT: i32 2, label [[SW_BB1:%.*]]
+; CHECK-NEXT: i32 1, label [[RETURN:%.*]]
+; CHECK-NEXT: i32 2, label [[SW_BB1:%.*]]
; CHECK-NEXT: ]
; CHECK: sw.bb1:
; CHECK-NEXT: br label [[RETURN]]
@@ -60,8 +63,9 @@ define dso_local noundef i1 @_Z6targetv() sanitize_hwaddress {
; CHECK-NEXT: [[RETVAL_0:%.*]] = phi i1 [ true, [[WHILE_BODY]] ], [ true, [[SW_BB1]] ], [ false, [[ENTRY:%.*]] ]
; CHECK-NEXT: [[TMP25:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[BUF]] to i64
-; CHECK-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; CHECK-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; CHECK-NEXT: [[TMP30:%.*]] = shl i64 [[TMP26]], 8
+; CHECK-NEXT: [[TMP31:%.*]] = ashr i64 [[TMP30]], 8
+; CHECK-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP31]], 4
; CHECK-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP28]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 256, i1 false)
; CHECK-NEXT: ret i1 [[RETVAL_0]]
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca-array.ll b/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca-array.ll
index 72a0f6bc8df5b8..2c88549344cefd 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca-array.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca-array.ll
@@ -20,7 +20,8 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[X:%.*]] = alloca { [4 x i8], [12 x i8] }, align 16
; CHECK-NEXT: [[TMP6:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0
; CHECK-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; CHECK-NEXT: [[TMP20:%.*]] = shl i64 [[TMP7]], 7
+; CHECK-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP20]], 7
; CHECK-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; CHECK-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
@@ -29,7 +30,8 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[Y:%.*]] = alloca i8, i64 16, align 16
; CHECK-NEXT: [[TMP12:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 1
; CHECK-NEXT: [[TMP13:%.*]] = ptrtoint ptr [[Y]] to i64
-; CHECK-NEXT: [[TMP14:%.*]] = and i64 [[TMP13]], -9079256848778919937
+; CHECK-NEXT: [[TMP21:%.*]] = shl i64 [[TMP13]], 7
+; CHECK-NEXT: [[TMP14:%.*]] = ashr i64 [[TMP21]], 7
; CHECK-NEXT: [[TMP15:%.*]] = shl i64 [[TMP12]], 57
; CHECK-NEXT: [[TMP16:%.*]] = or i64 [[TMP14]], [[TMP15]]
; CHECK-NEXT: [[Y_HWASAN:%.*]] = inttoptr i64 [[TMP16]] to ptr
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca-with-calls.ll b/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca-with-calls.ll
index 2a82d708a0ef13..4d5e88e8d8bee7 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca-with-calls.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca-with-calls.ll
@@ -21,7 +21,8 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[TMP3:%.*]] = call i8 @__hwasan_generate_tag()
; CHECK-NEXT: [[TMP4:%.*]] = zext i8 [[TMP3]] to i64
; CHECK-NEXT: [[TMP5:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP6:%.*]] = and i64 [[TMP5]], -9079256848778919937
+; CHECK-NEXT: [[TMP11:%.*]] = shl i64 [[TMP5]], 7
+; CHECK-NEXT: [[TMP6:%.*]] = ashr i64 [[TMP11]], 7
; CHECK-NEXT: [[TMP7:%.*]] = shl i64 [[TMP4]], 57
; CHECK-NEXT: [[TMP8:%.*]] = or i64 [[TMP6]], [[TMP7]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP8]] to ptr
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca.ll b/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca.ll
index 292a565a1e61bf..cb7e0baf4f6cd2 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/X86/alloca.ll
@@ -24,7 +24,8 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; CHECK-NEXT: [[TMP5:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0
; CHECK-NEXT: [[TMP6:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP6]], -9079256848778919937
+; CHECK-NEXT: [[TMP12:%.*]] = shl i64 [[TMP6]], 7
+; CHECK-NEXT: [[TMP7:%.*]] = ashr i64 [[TMP12]], 7
; CHECK-NEXT: [[TMP8:%.*]] = shl i64 [[TMP5]], 57
; CHECK-NEXT: [[TMP9:%.*]] = or i64 [[TMP7]], [[TMP8]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP9]] to ptr
@@ -39,7 +40,8 @@ define void @test_alloca() sanitize_hwaddress {
; INLINE-SAME: () #[[ATTR0:[0-9]+]] personality ptr @__hwasan_personality_thunk {
; INLINE-NEXT: entry:
; INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; INLINE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP0]], 7
+; INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP23]], 7
; INLINE-NEXT: [[TMP2:%.*]] = ashr i64 [[TMP0]], 3
; INLINE-NEXT: [[TMP3:%.*]] = call ptr @llvm.frameaddress.p0(i32 0)
; INLINE-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
@@ -61,14 +63,16 @@ define void @test_alloca() sanitize_hwaddress {
; INLINE-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; INLINE-NEXT: [[TMP16:%.*]] = xor i64 [[TMP2]], 0
; INLINE-NEXT: [[TMP17:%.*]] = ptrtoint ptr [[X]] to i64
-; INLINE-NEXT: [[TMP18:%.*]] = and i64 [[TMP17]], -9079256848778919937
+; INLINE-NEXT: [[TMP30:%.*]] = shl i64 [[TMP17]], 7
+; INLINE-NEXT: [[TMP18:%.*]] = ashr i64 [[TMP30]], 7
; INLINE-NEXT: [[TMP19:%.*]] = shl i64 [[TMP16]], 57
; INLINE-NEXT: [[TMP20:%.*]] = or i64 [[TMP18]], [[TMP19]]
; INLINE-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP20]] to ptr
; INLINE-NEXT: [[TMP21:%.*]] = trunc i64 [[TMP16]] to i8
; INLINE-NEXT: [[TMP22:%.*]] = ptrtoint ptr [[X]] to i64
-; INLINE-NEXT: [[TMP23:%.*]] = and i64 [[TMP22]], -9079256848778919937
-; INLINE-NEXT: [[TMP24:%.*]] = lshr i64 [[TMP23]], 4
+; INLINE-NEXT: [[TMP35:%.*]] = shl i64 [[TMP22]], 7
+; INLINE-NEXT: [[TMP36:%.*]] = ashr i64 [[TMP35]], 7
+; INLINE-NEXT: [[TMP24:%.*]] = ashr i64 [[TMP36]], 4
; INLINE-NEXT: [[TMP25:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP24]]
; INLINE-NEXT: [[TMP26:%.*]] = getelementptr i8, ptr [[TMP25]], i32 0
; INLINE-NEXT: store i8 4, ptr [[TMP26]], align 1
@@ -77,8 +81,9 @@ define void @test_alloca() sanitize_hwaddress {
; INLINE-NEXT: call void @use32(ptr nonnull [[X_HWASAN]])
; INLINE-NEXT: [[TMP28:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; INLINE-NEXT: [[TMP29:%.*]] = ptrtoint ptr [[X]] to i64
-; INLINE-NEXT: [[TMP30:%.*]] = and i64 [[TMP29]], -9079256848778919937
-; INLINE-NEXT: [[TMP31:%.*]] = lshr i64 [[TMP30]], 4
+; INLINE-NEXT: [[TMP33:%.*]] = shl i64 [[TMP29]], 7
+; INLINE-NEXT: [[TMP34:%.*]] = ashr i64 [[TMP33]], 7
+; INLINE-NEXT: [[TMP31:%.*]] = ashr i64 [[TMP34]], 4
; INLINE-NEXT: [[TMP32:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP31]]
; INLINE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP32]], i8 [[TMP28]], i64 1, i1 false)
; INLINE-NEXT: ret void
@@ -105,7 +110,8 @@ define i32 @test_simple(ptr %a) sanitize_hwaddress {
; CHECK-NEXT: [[BUF_SROA_0:%.*]] = alloca { i8, [15 x i8] }, align 16
; CHECK-NEXT: [[TMP5:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0
; CHECK-NEXT: [[TMP6:%.*]] = ptrtoint ptr [[BUF_SROA_0]] to i64
-; CHECK-NEXT: [[TMP7:%.*]] = and i64 [[TMP6]], -9079256848778919937
+; CHECK-NEXT: [[TMP13:%.*]] = shl i64 [[TMP6]], 7
+; CHECK-NEXT: [[TMP7:%.*]] = ashr i64 [[TMP13]], 7
; CHECK-NEXT: [[TMP8:%.*]] = shl i64 [[TMP5]], 57
; CHECK-NEXT: [[TMP9:%.*]] = or i64 [[TMP7]], [[TMP8]]
; CHECK-NEXT: [[BUF_SROA_0_HWASAN:%.*]] = inttoptr i64 [[TMP9]] to ptr
@@ -124,7 +130,8 @@ define i32 @test_simple(ptr %a) sanitize_hwaddress {
; INLINE-SAME: (ptr [[A:%.*]]) #[[ATTR0]] personality ptr @__hwasan_personality_thunk {
; INLINE-NEXT: entry:
; INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; INLINE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP0]], 7
+; INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP23]], 7
; INLINE-NEXT: [[TMP2:%.*]] = ashr i64 [[TMP0]], 3
; INLINE-NEXT: [[TMP3:%.*]] = call ptr @llvm.frameaddress.p0(i32 0)
; INLINE-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[TMP3]] to i64
@@ -146,15 +153,17 @@ define i32 @test_simple(ptr %a) sanitize_hwaddress {
; INLINE-NEXT: [[BUF_SROA_0:%.*]] = alloca { i8, [15 x i8] }, align 16
; INLINE-NEXT: [[TMP16:%.*]] = xor i64 [[TMP2]], 0
; INLINE-NEXT: [[TMP17:%.*]] = ptrtoint ptr [[BUF_SROA_0]] to i64
-; INLINE-NEXT: [[TMP18:%.*]] = and i64 [[TMP17]], -9079256848778919937
+; INLINE-NEXT: [[TMP31:%.*]] = shl i64 [[TMP17]], 7
+; INLINE-NEXT: [[TMP18:%.*]] = ashr i64 [[TMP31]], 7
; INLINE-NEXT: [[TMP19:%.*]] = shl i64 [[TMP16]], 57
; INLINE-NEXT: [[TMP20:%.*]] = or i64 [[TMP18]], [[TMP19]]
; INLINE-NEXT: [[BUF_SROA_0_HWASAN:%.*]] = inttoptr i64 [[TMP20]] to ptr
; INLINE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[BUF_SROA_0]])
; INLINE-NEXT: [[TMP21:%.*]] = trunc i64 [[TMP16]] to i8
; INLINE-NEXT: [[TMP22:%.*]] = ptrtoint ptr [[BUF_SROA_0]] to i64
-; INLINE-NEXT: [[TMP23:%.*]] = and i64 [[TMP22]], -9079256848778919937
-; INLINE-NEXT: [[TMP24:%.*]] = lshr i64 [[TMP23]], 4
+; INLINE-NEXT: [[TMP38:%.*]] = shl i64 [[TMP22]], 7
+; INLINE-NEXT: [[TMP39:%.*]] = ashr i64 [[TMP38]], 7
+; INLINE-NEXT: [[TMP24:%.*]] = ashr i64 [[TMP39]], 4
; INLINE-NEXT: [[TMP25:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP24]]
; INLINE-NEXT: [[TMP26:%.*]] = getelementptr i8, ptr [[TMP25]], i32 0
; INLINE-NEXT: store i8 1, ptr [[TMP26]], align 1
@@ -163,38 +172,40 @@ define i32 @test_simple(ptr %a) sanitize_hwaddress {
; INLINE-NEXT: [[TMP28:%.*]] = ptrtoint ptr [[BUF_SROA_0_HWASAN]] to i64
; INLINE-NEXT: [[TMP29:%.*]] = lshr i64 [[TMP28]], 57
; INLINE-NEXT: [[TMP30:%.*]] = trunc i64 [[TMP29]] to i8
-; INLINE-NEXT: [[TMP31:%.*]] = and i64 [[TMP28]], -9079256848778919937
-; INLINE-NEXT: [[TMP32:%.*]] = lshr i64 [[TMP31]], 4
+; INLINE-NEXT: [[TMP44:%.*]] = shl i64 [[TMP28]], 7
+; INLINE-NEXT: [[TMP49:%.*]] = ashr i64 [[TMP44]], 7
+; INLINE-NEXT: [[TMP32:%.*]] = ashr i64 [[TMP49]], 4
; INLINE-NEXT: [[TMP33:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP32]]
; INLINE-NEXT: [[TMP34:%.*]] = load i8, ptr [[TMP33]], align 1
; INLINE-NEXT: [[TMP35:%.*]] = icmp ne i8 [[TMP30]], [[TMP34]]
; INLINE-NEXT: br i1 [[TMP35]], label [[TMP36:%.*]], label [[TMP50:%.*]], !prof [[PROF1:![0-9]+]]
-; INLINE: 36:
+; INLINE: 40:
; INLINE-NEXT: [[TMP37:%.*]] = icmp ugt i8 [[TMP34]], 15
-; INLINE-NEXT: br i1 [[TMP37]], label [[TMP38:%.*]], label [[TMP39:%.*]], !prof [[PROF1]]
-; INLINE: 38:
+; INLINE-NEXT: br i1 [[TMP37]], label [[TMP56:%.*]], label [[TMP59:%.*]], !prof [[PROF1]]
+; INLINE: 42:
; INLINE-NEXT: call void asm sideeffect "int3\0Anopl 80([[RAX:%.*]])", "{rdi}"(i64 [[TMP28]])
; INLINE-NEXT: unreachable
-; INLINE: 39:
+; INLINE: 43:
; INLINE-NEXT: [[TMP40:%.*]] = and i64 [[TMP28]], 15
; INLINE-NEXT: [[TMP41:%.*]] = trunc i64 [[TMP40]] to i8
; INLINE-NEXT: [[TMP42:%.*]] = add i8 [[TMP41]], 0
; INLINE-NEXT: [[TMP43:%.*]] = icmp uge i8 [[TMP42]], [[TMP34]]
-; INLINE-NEXT: br i1 [[TMP43]], label [[TMP38]], label [[TMP44:%.*]], !prof [[PROF1]]
-; INLINE: 44:
-; INLINE-NEXT: [[TMP45:%.*]] = or i64 [[TMP31]], 15
+; INLINE-NEXT: br i1 [[TMP43]], label [[TMP56]], label [[TMP60:%.*]], !prof [[PROF1]]
+; INLINE: 48:
+; INLINE-NEXT: [[TMP45:%.*]] = or i64 [[TMP28]], 15
; INLINE-NEXT: [[TMP46:%.*]] = inttoptr i64 [[TMP45]] to ptr
; INLINE-NEXT: [[TMP47:%.*]] = load i8, ptr [[TMP46]], align 1
; INLINE-NEXT: [[TMP48:%.*]] = icmp ne i8 [[TMP30]], [[TMP47]]
-; INLINE-NEXT: br i1 [[TMP48]], label [[TMP38]], label [[TMP49:%.*]], !prof [[PROF1]]
-; INLINE: 49:
+; INLINE-NEXT: br i1 [[TMP48]], label [[TMP56]], label [[TMP53:%.*]], !prof [[PROF1]]
+; INLINE: 53:
; INLINE-NEXT: br label [[TMP50]]
-; INLINE: 50:
+; INLINE: 54:
; INLINE-NEXT: store volatile i8 0, ptr [[BUF_SROA_0_HWASAN]], align 4
; INLINE-NEXT: [[TMP51:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; INLINE-NEXT: [[TMP52:%.*]] = ptrtoint ptr [[BUF_SROA_0]] to i64
-; INLINE-NEXT: [[TMP53:%.*]] = and i64 [[TMP52]], -9079256848778919937
-; INLINE-NEXT: [[TMP54:%.*]] = lshr i64 [[TMP53]], 4
+; INLINE-NEXT: [[TMP57:%.*]] = shl i64 [[TMP52]], 7
+; INLINE-NEXT: [[TMP58:%.*]] = ashr i64 [[TMP57]], 7
+; INLINE-NEXT: [[TMP54:%.*]] = ashr i64 [[TMP58]], 4
; INLINE-NEXT: [[TMP55:%.*]] = getelementptr i8, ptr [[TMP14]], i64 [[TMP54]]
; INLINE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP55]], i8 [[TMP51]], i64 1, i1 false)
; INLINE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[BUF_SROA_0]])
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/X86/basic.ll b/llvm/test/Instrumentation/HWAddressSanitizer/X86/basic.ll
index ebe66e0d51baab..42accc41d0555e 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/X86/basic.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/X86/basic.ll
@@ -64,40 +64,42 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; ABORT-INLINE-SAME: (ptr [[A:%.*]]) #[[ATTR0:[0-9]+]] {
; ABORT-INLINE-NEXT: entry:
; ABORT-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; ABORT-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; ABORT-INLINE-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 7
+; ABORT-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 7
; ABORT-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; ABORT-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; ABORT-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; ABORT-INLINE-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-INLINE-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 57
; ABORT-INLINE-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; ABORT-INLINE-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], -9079256848778919937
-; ABORT-INLINE-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; ABORT-INLINE-NEXT: [[TMP13:%.*]] = shl i64 [[TMP4]], 7
+; ABORT-INLINE-NEXT: [[TMP14:%.*]] = ashr i64 [[TMP13]], 7
+; ABORT-INLINE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP14]], 4
; ABORT-INLINE-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; ABORT-INLINE-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; ABORT-INLINE-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
; ABORT-INLINE-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP26:%.*]], !prof [[PROF1:![0-9]+]]
-; ABORT-INLINE: 12:
-; ABORT-INLINE-NEXT: [[TMP13:%.*]] = icmp ugt i8 [[TMP10]], 15
-; ABORT-INLINE-NEXT: br i1 [[TMP13]], label [[TMP14:%.*]], label [[TMP15:%.*]], !prof [[PROF1]]
; ABORT-INLINE: 14:
+; ABORT-INLINE-NEXT: [[TMP15:%.*]] = icmp ugt i8 [[TMP10]], 15
+; ABORT-INLINE-NEXT: br i1 [[TMP15]], label [[TMP20:%.*]], label [[TMP25:%.*]], !prof [[PROF1]]
+; ABORT-INLINE: 16:
; ABORT-INLINE-NEXT: call void asm sideeffect "int3\0Anopl 64([[RAX:%.*]])", "{rdi}"(i64 [[TMP4]])
; ABORT-INLINE-NEXT: unreachable
-; ABORT-INLINE: 15:
+; ABORT-INLINE: 17:
; ABORT-INLINE-NEXT: [[TMP16:%.*]] = and i64 [[TMP4]], 15
; ABORT-INLINE-NEXT: [[TMP17:%.*]] = trunc i64 [[TMP16]] to i8
; ABORT-INLINE-NEXT: [[TMP18:%.*]] = add i8 [[TMP17]], 0
; ABORT-INLINE-NEXT: [[TMP19:%.*]] = icmp uge i8 [[TMP18]], [[TMP10]]
-; ABORT-INLINE-NEXT: br i1 [[TMP19]], label [[TMP14]], label [[TMP20:%.*]], !prof [[PROF1]]
-; ABORT-INLINE: 20:
-; ABORT-INLINE-NEXT: [[TMP21:%.*]] = or i64 [[TMP7]], 15
+; ABORT-INLINE-NEXT: br i1 [[TMP19]], label [[TMP20]], label [[TMP28:%.*]], !prof [[PROF1]]
+; ABORT-INLINE: 22:
+; ABORT-INLINE-NEXT: [[TMP21:%.*]] = or i64 [[TMP4]], 15
; ABORT-INLINE-NEXT: [[TMP22:%.*]] = inttoptr i64 [[TMP21]] to ptr
; ABORT-INLINE-NEXT: [[TMP23:%.*]] = load i8, ptr [[TMP22]], align 1
; ABORT-INLINE-NEXT: [[TMP24:%.*]] = icmp ne i8 [[TMP6]], [[TMP23]]
-; ABORT-INLINE-NEXT: br i1 [[TMP24]], label [[TMP14]], label [[TMP25:%.*]], !prof [[PROF1]]
-; ABORT-INLINE: 25:
+; ABORT-INLINE-NEXT: br i1 [[TMP24]], label [[TMP20]], label [[TMP27:%.*]], !prof [[PROF1]]
+; ABORT-INLINE: 27:
; ABORT-INLINE-NEXT: br label [[TMP26]]
-; ABORT-INLINE: 26:
+; ABORT-INLINE: 28:
; ABORT-INLINE-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; ABORT-INLINE-NEXT: ret i8 [[B]]
;
@@ -105,40 +107,42 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; RECOVER-INLINE-SAME: (ptr [[A:%.*]]) #[[ATTR0:[0-9]+]] {
; RECOVER-INLINE-NEXT: entry:
; RECOVER-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; RECOVER-INLINE-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 7
+; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 7
; RECOVER-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; RECOVER-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; RECOVER-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; RECOVER-INLINE-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-INLINE-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 57
; RECOVER-INLINE-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; RECOVER-INLINE-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], -9079256848778919937
-; RECOVER-INLINE-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; RECOVER-INLINE-NEXT: [[TMP13:%.*]] = shl i64 [[TMP4]], 7
+; RECOVER-INLINE-NEXT: [[TMP14:%.*]] = ashr i64 [[TMP13]], 7
+; RECOVER-INLINE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP14]], 4
; RECOVER-INLINE-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; RECOVER-INLINE-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; RECOVER-INLINE-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
; RECOVER-INLINE-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP26:%.*]], !prof [[PROF1:![0-9]+]]
-; RECOVER-INLINE: 12:
-; RECOVER-INLINE-NEXT: [[TMP13:%.*]] = icmp ugt i8 [[TMP10]], 15
-; RECOVER-INLINE-NEXT: br i1 [[TMP13]], label [[TMP14:%.*]], label [[TMP15:%.*]], !prof [[PROF1]]
; RECOVER-INLINE: 14:
+; RECOVER-INLINE-NEXT: [[TMP15:%.*]] = icmp ugt i8 [[TMP10]], 15
+; RECOVER-INLINE-NEXT: br i1 [[TMP15]], label [[TMP20:%.*]], label [[TMP27:%.*]], !prof [[PROF1]]
+; RECOVER-INLINE: 16:
; RECOVER-INLINE-NEXT: call void asm sideeffect "int3\0Anopl 96([[RAX:%.*]])", "{rdi}"(i64 [[TMP4]])
; RECOVER-INLINE-NEXT: br label [[TMP25:%.*]]
-; RECOVER-INLINE: 15:
+; RECOVER-INLINE: 17:
; RECOVER-INLINE-NEXT: [[TMP16:%.*]] = and i64 [[TMP4]], 15
; RECOVER-INLINE-NEXT: [[TMP17:%.*]] = trunc i64 [[TMP16]] to i8
; RECOVER-INLINE-NEXT: [[TMP18:%.*]] = add i8 [[TMP17]], 0
; RECOVER-INLINE-NEXT: [[TMP19:%.*]] = icmp uge i8 [[TMP18]], [[TMP10]]
-; RECOVER-INLINE-NEXT: br i1 [[TMP19]], label [[TMP14]], label [[TMP20:%.*]], !prof [[PROF1]]
-; RECOVER-INLINE: 20:
-; RECOVER-INLINE-NEXT: [[TMP21:%.*]] = or i64 [[TMP7]], 15
+; RECOVER-INLINE-NEXT: br i1 [[TMP19]], label [[TMP20]], label [[TMP28:%.*]], !prof [[PROF1]]
+; RECOVER-INLINE: 22:
+; RECOVER-INLINE-NEXT: [[TMP21:%.*]] = or i64 [[TMP4]], 15
; RECOVER-INLINE-NEXT: [[TMP22:%.*]] = inttoptr i64 [[TMP21]] to ptr
; RECOVER-INLINE-NEXT: [[TMP23:%.*]] = load i8, ptr [[TMP22]], align 1
; RECOVER-INLINE-NEXT: [[TMP24:%.*]] = icmp ne i8 [[TMP6]], [[TMP23]]
-; RECOVER-INLINE-NEXT: br i1 [[TMP24]], label [[TMP14]], label [[TMP25]], !prof [[PROF1]]
-; RECOVER-INLINE: 25:
+; RECOVER-INLINE-NEXT: br i1 [[TMP24]], label [[TMP20]], label [[TMP25]], !prof [[PROF1]]
+; RECOVER-INLINE: 27:
; RECOVER-INLINE-NEXT: br label [[TMP26]]
-; RECOVER-INLINE: 26:
+; RECOVER-INLINE: 28:
; RECOVER-INLINE-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; RECOVER-INLINE-NEXT: ret i8 [[B]]
;
@@ -197,7 +201,8 @@ define i40 @test_load40(ptr %a) sanitize_hwaddress {
; ABORT-INLINE-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; ABORT-INLINE-NEXT: entry:
; ABORT-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; ABORT-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; ABORT-INLINE-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 7
+; ABORT-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 7
; ABORT-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; ABORT-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; ABORT-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -210,7 +215,8 @@ define i40 @test_load40(ptr %a) sanitize_hwaddress {
; RECOVER-INLINE-SAME: (ptr [[A:%.*]]) #[[ATTR0]] {
; RECOVER-INLINE-NEXT: entry:
; RECOVER-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; RECOVER-INLINE-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 7
+; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 7
; RECOVER-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; RECOVER-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; RECOVER-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -274,40 +280,42 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; ABORT-INLINE-SAME: (ptr [[A:%.*]], i8 [[B:%.*]]) #[[ATTR0]] {
; ABORT-INLINE-NEXT: entry:
; ABORT-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; ABORT-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; ABORT-INLINE-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 7
+; ABORT-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 7
; ABORT-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; ABORT-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; ABORT-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; ABORT-INLINE-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; ABORT-INLINE-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 57
; ABORT-INLINE-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; ABORT-INLINE-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], -9079256848778919937
-; ABORT-INLINE-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; ABORT-INLINE-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 7
+; ABORT-INLINE-NEXT: [[TMP13:%.*]] = ashr i64 [[TMP12]], 7
+; ABORT-INLINE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP13]], 4
; ABORT-INLINE-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; ABORT-INLINE-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; ABORT-INLINE-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; ABORT-INLINE-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP26:%.*]], !prof [[PROF1]]
-; ABORT-INLINE: 12:
-; ABORT-INLINE-NEXT: [[TMP13:%.*]] = icmp ugt i8 [[TMP10]], 15
-; ABORT-INLINE-NEXT: br i1 [[TMP13]], label [[TMP14:%.*]], label [[TMP15:%.*]], !prof [[PROF1]]
+; ABORT-INLINE-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP26:%.*]], !prof [[PROF1]]
; ABORT-INLINE: 14:
+; ABORT-INLINE-NEXT: [[TMP15:%.*]] = icmp ugt i8 [[TMP10]], 15
+; ABORT-INLINE-NEXT: br i1 [[TMP15]], label [[TMP20:%.*]], label [[TMP25:%.*]], !prof [[PROF1]]
+; ABORT-INLINE: 16:
; ABORT-INLINE-NEXT: call void asm sideeffect "int3\0Anopl 80([[RAX:%.*]])", "{rdi}"(i64 [[TMP4]])
; ABORT-INLINE-NEXT: unreachable
-; ABORT-INLINE: 15:
+; ABORT-INLINE: 17:
; ABORT-INLINE-NEXT: [[TMP16:%.*]] = and i64 [[TMP4]], 15
; ABORT-INLINE-NEXT: [[TMP17:%.*]] = trunc i64 [[TMP16]] to i8
; ABORT-INLINE-NEXT: [[TMP18:%.*]] = add i8 [[TMP17]], 0
; ABORT-INLINE-NEXT: [[TMP19:%.*]] = icmp uge i8 [[TMP18]], [[TMP10]]
-; ABORT-INLINE-NEXT: br i1 [[TMP19]], label [[TMP14]], label [[TMP20:%.*]], !prof [[PROF1]]
-; ABORT-INLINE: 20:
-; ABORT-INLINE-NEXT: [[TMP21:%.*]] = or i64 [[TMP7]], 15
+; ABORT-INLINE-NEXT: br i1 [[TMP19]], label [[TMP20]], label [[TMP28:%.*]], !prof [[PROF1]]
+; ABORT-INLINE: 22:
+; ABORT-INLINE-NEXT: [[TMP21:%.*]] = or i64 [[TMP4]], 15
; ABORT-INLINE-NEXT: [[TMP22:%.*]] = inttoptr i64 [[TMP21]] to ptr
; ABORT-INLINE-NEXT: [[TMP23:%.*]] = load i8, ptr [[TMP22]], align 1
; ABORT-INLINE-NEXT: [[TMP24:%.*]] = icmp ne i8 [[TMP6]], [[TMP23]]
-; ABORT-INLINE-NEXT: br i1 [[TMP24]], label [[TMP14]], label [[TMP25:%.*]], !prof [[PROF1]]
-; ABORT-INLINE: 25:
+; ABORT-INLINE-NEXT: br i1 [[TMP24]], label [[TMP20]], label [[TMP27:%.*]], !prof [[PROF1]]
+; ABORT-INLINE: 27:
; ABORT-INLINE-NEXT: br label [[TMP26]]
-; ABORT-INLINE: 26:
+; ABORT-INLINE: 28:
; ABORT-INLINE-NEXT: store i8 [[B]], ptr [[A]], align 4
; ABORT-INLINE-NEXT: ret void
;
@@ -315,40 +323,42 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; RECOVER-INLINE-SAME: (ptr [[A:%.*]], i8 [[B:%.*]]) #[[ATTR0]] {
; RECOVER-INLINE-NEXT: entry:
; RECOVER-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; RECOVER-INLINE-NEXT: [[TMP7:%.*]] = shl i64 [[TMP0]], 7
+; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP7]], 7
; RECOVER-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; RECOVER-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; RECOVER-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
; RECOVER-INLINE-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-INLINE-NEXT: [[TMP5:%.*]] = lshr i64 [[TMP4]], 57
; RECOVER-INLINE-NEXT: [[TMP6:%.*]] = trunc i64 [[TMP5]] to i8
-; RECOVER-INLINE-NEXT: [[TMP7:%.*]] = and i64 [[TMP4]], -9079256848778919937
-; RECOVER-INLINE-NEXT: [[TMP8:%.*]] = lshr i64 [[TMP7]], 4
+; RECOVER-INLINE-NEXT: [[TMP12:%.*]] = shl i64 [[TMP4]], 7
+; RECOVER-INLINE-NEXT: [[TMP13:%.*]] = ashr i64 [[TMP12]], 7
+; RECOVER-INLINE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP13]], 4
; RECOVER-INLINE-NEXT: [[TMP9:%.*]] = getelementptr i8, ptr [[TMP3]], i64 [[TMP8]]
; RECOVER-INLINE-NEXT: [[TMP10:%.*]] = load i8, ptr [[TMP9]], align 1
; RECOVER-INLINE-NEXT: [[TMP11:%.*]] = icmp ne i8 [[TMP6]], [[TMP10]]
-; RECOVER-INLINE-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP26:%.*]], !prof [[PROF1]]
-; RECOVER-INLINE: 12:
-; RECOVER-INLINE-NEXT: [[TMP13:%.*]] = icmp ugt i8 [[TMP10]], 15
-; RECOVER-INLINE-NEXT: br i1 [[TMP13]], label [[TMP14:%.*]], label [[TMP15:%.*]], !prof [[PROF1]]
+; RECOVER-INLINE-NEXT: br i1 [[TMP11]], label [[TMP14:%.*]], label [[TMP26:%.*]], !prof [[PROF1]]
; RECOVER-INLINE: 14:
+; RECOVER-INLINE-NEXT: [[TMP15:%.*]] = icmp ugt i8 [[TMP10]], 15
+; RECOVER-INLINE-NEXT: br i1 [[TMP15]], label [[TMP20:%.*]], label [[TMP27:%.*]], !prof [[PROF1]]
+; RECOVER-INLINE: 16:
; RECOVER-INLINE-NEXT: call void asm sideeffect "int3\0Anopl 112([[RAX:%.*]])", "{rdi}"(i64 [[TMP4]])
; RECOVER-INLINE-NEXT: br label [[TMP25:%.*]]
-; RECOVER-INLINE: 15:
+; RECOVER-INLINE: 17:
; RECOVER-INLINE-NEXT: [[TMP16:%.*]] = and i64 [[TMP4]], 15
; RECOVER-INLINE-NEXT: [[TMP17:%.*]] = trunc i64 [[TMP16]] to i8
; RECOVER-INLINE-NEXT: [[TMP18:%.*]] = add i8 [[TMP17]], 0
; RECOVER-INLINE-NEXT: [[TMP19:%.*]] = icmp uge i8 [[TMP18]], [[TMP10]]
-; RECOVER-INLINE-NEXT: br i1 [[TMP19]], label [[TMP14]], label [[TMP20:%.*]], !prof [[PROF1]]
-; RECOVER-INLINE: 20:
-; RECOVER-INLINE-NEXT: [[TMP21:%.*]] = or i64 [[TMP7]], 15
+; RECOVER-INLINE-NEXT: br i1 [[TMP19]], label [[TMP20]], label [[TMP28:%.*]], !prof [[PROF1]]
+; RECOVER-INLINE: 22:
+; RECOVER-INLINE-NEXT: [[TMP21:%.*]] = or i64 [[TMP4]], 15
; RECOVER-INLINE-NEXT: [[TMP22:%.*]] = inttoptr i64 [[TMP21]] to ptr
; RECOVER-INLINE-NEXT: [[TMP23:%.*]] = load i8, ptr [[TMP22]], align 1
; RECOVER-INLINE-NEXT: [[TMP24:%.*]] = icmp ne i8 [[TMP6]], [[TMP23]]
-; RECOVER-INLINE-NEXT: br i1 [[TMP24]], label [[TMP14]], label [[TMP25]], !prof [[PROF1]]
-; RECOVER-INLINE: 25:
+; RECOVER-INLINE-NEXT: br i1 [[TMP24]], label [[TMP20]], label [[TMP25]], !prof [[PROF1]]
+; RECOVER-INLINE: 27:
; RECOVER-INLINE-NEXT: br label [[TMP26]]
-; RECOVER-INLINE: 26:
+; RECOVER-INLINE: 28:
; RECOVER-INLINE-NEXT: store i8 [[B]], ptr [[A]], align 4
; RECOVER-INLINE-NEXT: ret void
;
@@ -407,7 +417,8 @@ define void @test_store40(ptr %a, i40 %b) sanitize_hwaddress {
; ABORT-INLINE-SAME: (ptr [[A:%.*]], i40 [[B:%.*]]) #[[ATTR0]] {
; ABORT-INLINE-NEXT: entry:
; ABORT-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; ABORT-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; ABORT-INLINE-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 7
+; ABORT-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 7
; ABORT-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; ABORT-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; ABORT-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -420,7 +431,8 @@ define void @test_store40(ptr %a, i40 %b) sanitize_hwaddress {
; RECOVER-INLINE-SAME: (ptr [[A:%.*]], i40 [[B:%.*]]) #[[ATTR0]] {
; RECOVER-INLINE-NEXT: entry:
; RECOVER-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; RECOVER-INLINE-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 7
+; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 7
; RECOVER-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; RECOVER-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; RECOVER-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -484,7 +496,8 @@ define void @test_store_unaligned(ptr %a, i64 %b) sanitize_hwaddress {
; ABORT-INLINE-SAME: (ptr [[A:%.*]], i64 [[B:%.*]]) #[[ATTR0]] {
; ABORT-INLINE-NEXT: entry:
; ABORT-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; ABORT-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; ABORT-INLINE-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 7
+; ABORT-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 7
; ABORT-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; ABORT-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; ABORT-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
@@ -497,7 +510,8 @@ define void @test_store_unaligned(ptr %a, i64 %b) sanitize_hwaddress {
; RECOVER-INLINE-SAME: (ptr [[A:%.*]], i64 [[B:%.*]]) #[[ATTR0]] {
; RECOVER-INLINE-NEXT: entry:
; RECOVER-INLINE-NEXT: [[TMP0:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = and i64 [[TMP0]], -9079256848778919937
+; RECOVER-INLINE-NEXT: [[TMP5:%.*]] = shl i64 [[TMP0]], 7
+; RECOVER-INLINE-NEXT: [[TMP1:%.*]] = ashr i64 [[TMP5]], 7
; RECOVER-INLINE-NEXT: [[TMP2:%.*]] = or i64 [[TMP1]], 4294967295
; RECOVER-INLINE-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP2]], 1
; RECOVER-INLINE-NEXT: [[TMP3:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/alloca-array.ll b/llvm/test/Instrumentation/HWAddressSanitizer/alloca-array.ll
index 51d34ce5b38826..7f7be20d7bc968 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/alloca-array.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/alloca-array.ll
@@ -33,40 +33,46 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[X:%.*]] = alloca { [4 x i8], [12 x i8] }, align 16
; CHECK-NEXT: [[TMP18:%.*]] = xor i64 [[TMP4]], 0
; CHECK-NEXT: [[TMP19:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP20:%.*]] = and i64 [[TMP19]], 72057594037927935
+; CHECK-NEXT: [[TMP25:%.*]] = shl i64 [[TMP19]], 8
+; CHECK-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP25]], 8
; CHECK-NEXT: [[TMP21:%.*]] = shl i64 [[TMP18]], 56
; CHECK-NEXT: [[TMP22:%.*]] = or i64 [[TMP20]], [[TMP21]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP22]] to ptr
; CHECK-NEXT: [[TMP23:%.*]] = trunc i64 [[TMP18]] to i8
; CHECK-NEXT: [[TMP24:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP25:%.*]] = and i64 [[TMP24]], 72057594037927935
-; CHECK-NEXT: [[TMP26:%.*]] = lshr i64 [[TMP25]], 4
+; CHECK-NEXT: [[TMP35:%.*]] = shl i64 [[TMP24]], 8
+; CHECK-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP35]], 8
+; CHECK-NEXT: [[TMP26:%.*]] = ashr i64 [[TMP40]], 4
; CHECK-NEXT: [[TMP27:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP26]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP27]], i8 [[TMP23]], i64 1, i1 false)
; CHECK-NEXT: [[Y:%.*]] = alloca i8, i64 16, align 16
; CHECK-NEXT: [[TMP28:%.*]] = xor i64 [[TMP4]], 128
; CHECK-NEXT: [[TMP29:%.*]] = ptrtoint ptr [[Y]] to i64
-; CHECK-NEXT: [[TMP30:%.*]] = and i64 [[TMP29]], 72057594037927935
+; CHECK-NEXT: [[TMP48:%.*]] = shl i64 [[TMP29]], 8
+; CHECK-NEXT: [[TMP30:%.*]] = ashr i64 [[TMP48]], 8
; CHECK-NEXT: [[TMP31:%.*]] = shl i64 [[TMP28]], 56
; CHECK-NEXT: [[TMP32:%.*]] = or i64 [[TMP30]], [[TMP31]]
; CHECK-NEXT: [[Y_HWASAN:%.*]] = inttoptr i64 [[TMP32]] to ptr
; CHECK-NEXT: [[TMP33:%.*]] = trunc i64 [[TMP28]] to i8
; CHECK-NEXT: [[TMP34:%.*]] = ptrtoint ptr [[Y]] to i64
-; CHECK-NEXT: [[TMP35:%.*]] = and i64 [[TMP34]], 72057594037927935
-; CHECK-NEXT: [[TMP36:%.*]] = lshr i64 [[TMP35]], 4
+; CHECK-NEXT: [[TMP49:%.*]] = shl i64 [[TMP34]], 8
+; CHECK-NEXT: [[TMP52:%.*]] = ashr i64 [[TMP49]], 8
+; CHECK-NEXT: [[TMP36:%.*]] = ashr i64 [[TMP52]], 4
; CHECK-NEXT: [[TMP37:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP36]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP37]], i8 [[TMP33]], i64 1, i1 false)
; CHECK-NEXT: call void @use(ptr [[X_HWASAN]], ptr [[Y_HWASAN]])
; CHECK-NEXT: [[TMP38:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP39:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP40:%.*]] = and i64 [[TMP39]], 72057594037927935
-; CHECK-NEXT: [[TMP41:%.*]] = lshr i64 [[TMP40]], 4
+; CHECK-NEXT: [[TMP53:%.*]] = shl i64 [[TMP39]], 8
+; CHECK-NEXT: [[TMP45:%.*]] = ashr i64 [[TMP53]], 8
+; CHECK-NEXT: [[TMP41:%.*]] = ashr i64 [[TMP45]], 4
; CHECK-NEXT: [[TMP42:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP41]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP42]], i8 [[TMP38]], i64 1, i1 false)
; CHECK-NEXT: [[TMP43:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP44:%.*]] = ptrtoint ptr [[Y]] to i64
-; CHECK-NEXT: [[TMP45:%.*]] = and i64 [[TMP44]], 72057594037927935
-; CHECK-NEXT: [[TMP46:%.*]] = lshr i64 [[TMP45]], 4
+; CHECK-NEXT: [[TMP50:%.*]] = shl i64 [[TMP44]], 8
+; CHECK-NEXT: [[TMP51:%.*]] = ashr i64 [[TMP50]], 8
+; CHECK-NEXT: [[TMP46:%.*]] = ashr i64 [[TMP51]], 4
; CHECK-NEXT: [[TMP47:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP46]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP47]], i8 [[TMP43]], i64 1, i1 false)
; CHECK-NEXT: ret void
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/alloca-compat.ll b/llvm/test/Instrumentation/HWAddressSanitizer/alloca-compat.ll
index 9e9ed50d35daf6..4b2cc79fd2df86 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/alloca-compat.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/alloca-compat.ll
@@ -35,21 +35,24 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; CHECK-NEXT: [[TMP18:%.*]] = xor i64 [[TMP4]], 0
; CHECK-NEXT: [[TMP19:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP20:%.*]] = and i64 [[TMP19]], 72057594037927935
+; CHECK-NEXT: [[TMP25:%.*]] = shl i64 [[TMP19]], 8
+; CHECK-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP25]], 8
; CHECK-NEXT: [[TMP21:%.*]] = shl i64 [[TMP18]], 56
; CHECK-NEXT: [[TMP22:%.*]] = or i64 [[TMP20]], [[TMP21]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP22]] to ptr
; CHECK-NEXT: [[TMP23:%.*]] = trunc i64 [[TMP18]] to i8
; CHECK-NEXT: [[TMP24:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP25:%.*]] = and i64 [[TMP24]], 72057594037927935
-; CHECK-NEXT: [[TMP26:%.*]] = lshr i64 [[TMP25]], 4
+; CHECK-NEXT: [[TMP30:%.*]] = shl i64 [[TMP24]], 8
+; CHECK-NEXT: [[TMP34:%.*]] = ashr i64 [[TMP30]], 8
+; CHECK-NEXT: [[TMP26:%.*]] = ashr i64 [[TMP34]], 4
; CHECK-NEXT: [[TMP27:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP26]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP27]], i8 [[TMP23]], i64 1, i1 false)
; CHECK-NEXT: call void @use32(ptr nonnull [[X_HWASAN]])
; CHECK-NEXT: [[TMP28:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP29:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP30:%.*]] = and i64 [[TMP29]], 72057594037927935
-; CHECK-NEXT: [[TMP31:%.*]] = lshr i64 [[TMP30]], 4
+; CHECK-NEXT: [[TMP35:%.*]] = shl i64 [[TMP29]], 8
+; CHECK-NEXT: [[TMP33:%.*]] = ashr i64 [[TMP35]], 8
+; CHECK-NEXT: [[TMP31:%.*]] = ashr i64 [[TMP33]], 4
; CHECK-NEXT: [[TMP32:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP31]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP32]], i8 [[TMP28]], i64 1, i1 false)
; CHECK-NEXT: ret void
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/alloca-with-calls.ll b/llvm/test/Instrumentation/HWAddressSanitizer/alloca-with-calls.ll
index 0ef09321e41adc..68706a4cc915f3 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/alloca-with-calls.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/alloca-with-calls.ll
@@ -37,21 +37,24 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[TMP17:%.*]] = call i8 @__hwasan_generate_tag()
; CHECK-NEXT: [[TMP18:%.*]] = zext i8 [[TMP17]] to i64
; CHECK-NEXT: [[TMP19:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP20:%.*]] = and i64 [[TMP19]], 72057594037927935
+; CHECK-NEXT: [[TMP25:%.*]] = shl i64 [[TMP19]], 8
+; CHECK-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP25]], 8
; CHECK-NEXT: [[TMP21:%.*]] = shl i64 [[TMP18]], 56
; CHECK-NEXT: [[TMP22:%.*]] = or i64 [[TMP20]], [[TMP21]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP22]] to ptr
; CHECK-NEXT: [[TMP23:%.*]] = trunc i64 [[TMP18]] to i8
; CHECK-NEXT: [[TMP24:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP25:%.*]] = and i64 [[TMP24]], 72057594037927935
-; CHECK-NEXT: [[TMP26:%.*]] = lshr i64 [[TMP25]], 4
+; CHECK-NEXT: [[TMP30:%.*]] = shl i64 [[TMP24]], 8
+; CHECK-NEXT: [[TMP34:%.*]] = ashr i64 [[TMP30]], 8
+; CHECK-NEXT: [[TMP26:%.*]] = ashr i64 [[TMP34]], 4
; CHECK-NEXT: [[TMP27:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP26]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP27]], i8 [[TMP23]], i64 1, i1 false)
; CHECK-NEXT: call void @use32(ptr nonnull [[X_HWASAN]])
; CHECK-NEXT: [[TMP28:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP29:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP30:%.*]] = and i64 [[TMP29]], 72057594037927935
-; CHECK-NEXT: [[TMP31:%.*]] = lshr i64 [[TMP30]], 4
+; CHECK-NEXT: [[TMP35:%.*]] = shl i64 [[TMP29]], 8
+; CHECK-NEXT: [[TMP33:%.*]] = ashr i64 [[TMP35]], 8
+; CHECK-NEXT: [[TMP31:%.*]] = ashr i64 [[TMP33]], 4
; CHECK-NEXT: [[TMP32:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP31]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP32]], i8 [[TMP28]], i64 1, i1 false)
; CHECK-NEXT: ret void
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/alloca.ll b/llvm/test/Instrumentation/HWAddressSanitizer/alloca.ll
index 4bd23ea76c159b..9605f08543d722 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/alloca.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/alloca.ll
@@ -46,26 +46,29 @@ define void @test_alloca() sanitize_hwaddress !dbg !15 {
; DYNAMIC-SHADOW-NEXT: #dbg_value(!DIArgList(ptr [[X]], ptr [[X]]), [[META10:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_tag_offset, 0, DW_OP_LLVM_arg, 1, DW_OP_LLVM_tag_offset, 0, DW_OP_plus, DW_OP_deref), [[META12:![0-9]+]])
; DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0, !dbg [[DBG13:![0-9]+]]
; DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = and i64 [[TMP4]], 72057594037927935, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = shl i64 [[TMP3]], 56, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = or i64 [[TMP5]], [[TMP6]], !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP7]] to ptr, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = trunc i64 [[TMP3]] to i8, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP10:%.*]] = and i64 [[TMP9]], 72057594037927935, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP11:%.*]] = lshr i64 [[TMP10]], 4, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP11]], !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = getelementptr i8, ptr [[TMP12]], i32 0, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: store i8 4, ptr [[TMP13]], align 1, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = getelementptr i8, ptr [[X]], i32 15, !dbg [[DBG13]]
-; DYNAMIC-SHADOW-NEXT: store i8 [[TMP8]], ptr [[TMP14]], align 1, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = shl i64 [[TMP4]], 8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = ashr i64 [[TMP5]], 8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = shl i64 [[TMP3]], 56, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = or i64 [[TMP6]], [[TMP7]], !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP8]] to ptr, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = trunc i64 [[TMP3]] to i8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP10:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP11:%.*]] = shl i64 [[TMP10]], 8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = ashr i64 [[TMP11]], 8, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = ashr i64 [[TMP12]], 4, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP13]], !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = getelementptr i8, ptr [[TMP14]], i32 0, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: store i8 4, ptr [[TMP17]], align 1, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: [[TMP16:%.*]] = getelementptr i8, ptr [[X]], i32 15, !dbg [[DBG13]]
+; DYNAMIC-SHADOW-NEXT: store i8 [[TMP9]], ptr [[TMP16]], align 1, !dbg [[DBG13]]
; DYNAMIC-SHADOW-NEXT: call void @use32(ptr nonnull [[X_HWASAN]]), !dbg [[DBG13]]
; DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8, !dbg [[DBG14:![0-9]+]]
-; DYNAMIC-SHADOW-NEXT: [[TMP16:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG14]]
-; DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = and i64 [[TMP16]], 72057594037927935, !dbg [[DBG14]]
-; DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = lshr i64 [[TMP17]], 4, !dbg [[DBG14]]
-; DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP18]], !dbg [[DBG14]]
-; DYNAMIC-SHADOW-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP19]], i8 [[TMP15]], i64 1, i1 false), !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = shl i64 [[TMP18]], 8, !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP19]], 8, !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP21:%.*]] = ashr i64 [[TMP20]], 4, !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: [[TMP22:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP21]], !dbg [[DBG14]]
+; DYNAMIC-SHADOW-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP22]], i8 [[TMP15]], i64 1, i1 false), !dbg [[DBG14]]
; DYNAMIC-SHADOW-NEXT: ret void, !dbg [[DBG14]]
;
; ZERO-BASED-SHADOW-LABEL: define void @test_alloca(
@@ -81,26 +84,29 @@ define void @test_alloca() sanitize_hwaddress !dbg !15 {
; ZERO-BASED-SHADOW-NEXT: #dbg_value(!DIArgList(ptr [[X]], ptr [[X]]), [[META10:![0-9]+]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_tag_offset, 0, DW_OP_LLVM_arg, 1, DW_OP_LLVM_tag_offset, 0, DW_OP_plus, DW_OP_deref), [[META12:![0-9]+]])
; ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0, !dbg [[DBG13:![0-9]+]]
; ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = and i64 [[TMP4]], 72057594037927935, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = shl i64 [[TMP3]], 56, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = or i64 [[TMP5]], [[TMP6]], !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP7]] to ptr, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = trunc i64 [[TMP3]] to i8, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP10:%.*]] = and i64 [[TMP9]], 72057594037927935, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP11:%.*]] = lshr i64 [[TMP10]], 4, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = inttoptr i64 [[TMP11]] to ptr, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = getelementptr i8, ptr [[TMP12]], i32 0, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: store i8 4, ptr [[TMP13]], align 1, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = getelementptr i8, ptr [[X]], i32 15, !dbg [[DBG13]]
-; ZERO-BASED-SHADOW-NEXT: store i8 [[TMP8]], ptr [[TMP14]], align 1, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = shl i64 [[TMP4]], 8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = ashr i64 [[TMP5]], 8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = shl i64 [[TMP3]], 56, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = or i64 [[TMP6]], [[TMP7]], !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP8]] to ptr, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = trunc i64 [[TMP3]] to i8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP10:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP11:%.*]] = shl i64 [[TMP10]], 8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = ashr i64 [[TMP11]], 8, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = ashr i64 [[TMP12]], 4, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = inttoptr i64 [[TMP13]] to ptr, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = getelementptr i8, ptr [[TMP14]], i32 0, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: store i8 4, ptr [[TMP17]], align 1, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP16:%.*]] = getelementptr i8, ptr [[X]], i32 15, !dbg [[DBG13]]
+; ZERO-BASED-SHADOW-NEXT: store i8 [[TMP9]], ptr [[TMP16]], align 1, !dbg [[DBG13]]
; ZERO-BASED-SHADOW-NEXT: call void @use32(ptr nonnull [[X_HWASAN]]), !dbg [[DBG13]]
; ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8, !dbg [[DBG14:![0-9]+]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP16:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG14]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = and i64 [[TMP16]], 72057594037927935, !dbg [[DBG14]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = lshr i64 [[TMP17]], 4, !dbg [[DBG14]]
-; ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = inttoptr i64 [[TMP18]] to ptr, !dbg [[DBG14]]
-; ZERO-BASED-SHADOW-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP19]], i8 [[TMP15]], i64 1, i1 false), !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = ptrtoint ptr [[X]] to i64, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = shl i64 [[TMP18]], 8, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP19]], 8, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP21:%.*]] = ashr i64 [[TMP20]], 4, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: [[TMP22:%.*]] = inttoptr i64 [[TMP21]] to ptr, !dbg [[DBG14]]
+; ZERO-BASED-SHADOW-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP22]], i8 [[TMP15]], i64 1, i1 false), !dbg [[DBG14]]
; ZERO-BASED-SHADOW-NEXT: ret void, !dbg [[DBG14]]
;
entry:
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/basic.ll b/llvm/test/Instrumentation/HWAddressSanitizer/basic.ll
index 4212293f42545e..f5c5b8a8e93b98 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/basic.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/basic.ll
@@ -37,16 +37,17 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP10:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP10]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1:![0-9]+]]
-; FASTPATH: 8:
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 0)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; FASTPATH-NEXT: ret i8 [[B]]
;
@@ -65,33 +66,34 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP10:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP10]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1:![0-9]+]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2336", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 0
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i8 [[B]]
;
@@ -110,33 +112,34 @@ define i8 @test_load8(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP10:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP10]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1:![0-9]+]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2336", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 0
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i8, ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i8 [[B]]
;
@@ -169,16 +172,17 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 1)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; FASTPATH-NEXT: ret i16 [[B]]
;
@@ -197,33 +201,34 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2337", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i16 [[B]]
;
@@ -242,33 +247,34 @@ define i16 @test_load16(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2337", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i16, ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i16 [[B]]
;
@@ -301,16 +307,17 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 2)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; FASTPATH-NEXT: ret i32 [[B]]
;
@@ -329,33 +336,34 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2338", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 3
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i32 [[B]]
;
@@ -374,33 +382,34 @@ define i32 @test_load32(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2338", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 3
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i32, ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i32 [[B]]
;
@@ -433,16 +442,17 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 3)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; FASTPATH-NEXT: ret i64 [[B]]
;
@@ -461,33 +471,34 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2339", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 7
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i64 [[B]]
;
@@ -506,33 +517,34 @@ define i64 @test_load64(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2339", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 7
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i64, ptr [[A]], align 8
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i64 [[B]]
;
@@ -565,16 +577,17 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 4)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; FASTPATH-NEXT: ret i128 [[B]]
;
@@ -593,33 +606,34 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2340", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; RECOVER-DYNAMIC-SHADOW-NEXT: ret i128 [[B]]
;
@@ -638,33 +652,34 @@ define i128 @test_load128(ptr %a) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2340", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[B:%.*]] = load i128, ptr [[A]], align 16
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret i128 [[B]]
;
@@ -766,16 +781,17 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 16)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: store i8 [[B]], ptr [[A]], align 4
; FASTPATH-NEXT: ret void
;
@@ -794,33 +810,34 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2352", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 0
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i8 [[B]], ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -839,33 +856,34 @@ define void @test_store8(ptr %a, i8 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2352", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 0
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i8 [[B]], ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -898,16 +916,17 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 17)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: store i16 [[B]], ptr [[A]], align 4
; FASTPATH-NEXT: ret void
;
@@ -926,33 +945,34 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2353", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i16 [[B]], ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -971,33 +991,34 @@ define void @test_store16(ptr %a, i16 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2353", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i16 [[B]], ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1030,16 +1051,17 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 18)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: store i32 [[B]], ptr [[A]], align 4
; FASTPATH-NEXT: ret void
;
@@ -1058,33 +1080,34 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2354", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 3
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i32 [[B]], ptr [[A]], align 4
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1103,33 +1126,34 @@ define void @test_store32(ptr %a, i32 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2354", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 3
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i32 [[B]], ptr [[A]], align 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1162,16 +1186,17 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 19)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: store i64 [[B]], ptr [[A]], align 8
; FASTPATH-NEXT: ret void
;
@@ -1190,33 +1215,34 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2355", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 7
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i64 [[B]], ptr [[A]], align 8
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1235,33 +1261,34 @@ define void @test_store64(ptr %a, i64 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2355", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 7
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i64 [[B]], ptr [[A]], align 8
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
@@ -1294,16 +1321,17 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; FASTPATH-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; FASTPATH-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; FASTPATH-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; FASTPATH-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; FASTPATH-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; FASTPATH-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; FASTPATH-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; FASTPATH-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; FASTPATH-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; FASTPATH-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; FASTPATH-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
-; FASTPATH: 8:
+; FASTPATH-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP9:%.*]], !prof [[PROF1]]
+; FASTPATH: 9:
; FASTPATH-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[DOTHWASAN_SHADOW]], ptr [[A]], i32 20)
; FASTPATH-NEXT: br label [[TMP9]]
-; FASTPATH: 9:
+; FASTPATH: 10:
; FASTPATH-NEXT: store i128 [[B]], ptr [[A]], align 16
; FASTPATH-NEXT: ret void
;
@@ -1322,33 +1350,34 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP5:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP4]]
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 8:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 9:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 10:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 11:
; RECOVER-DYNAMIC-SHADOW-NEXT: call void asm sideeffect "brk #2356", "{x0}"(i64 [[TMP0]])
; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-DYNAMIC-SHADOW: 11:
+; RECOVER-DYNAMIC-SHADOW: 12:
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 16:
-; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-DYNAMIC-SHADOW: 17:
+; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-DYNAMIC-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-DYNAMIC-SHADOW: 21:
-; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-DYNAMIC-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-DYNAMIC-SHADOW: 22:
+; RECOVER-DYNAMIC-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-DYNAMIC-SHADOW: 23:
; RECOVER-DYNAMIC-SHADOW-NEXT: store i128 [[B]], ptr [[A]], align 16
; RECOVER-DYNAMIC-SHADOW-NEXT: ret void
;
@@ -1367,33 +1396,34 @@ define void @test_store128(ptr %a, i128 %b) sanitize_hwaddress {
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP0:%.*]] = ptrtoint ptr [[A]] to i64
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP1:%.*]] = lshr i64 [[TMP0]], 56
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP2:%.*]] = trunc i64 [[TMP1]] to i8
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = and i64 [[TMP0]], 72057594037927935
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = lshr i64 [[TMP3]], 4
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP3:%.*]] = shl i64 [[TMP0]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP3]], 8
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP4:%.*]] = ashr i64 [[TMP8]], 4
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP5:%.*]] = inttoptr i64 [[TMP4]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP6:%.*]] = load i8, ptr [[TMP5]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP7:%.*]] = icmp ne i8 [[TMP2]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP8:%.*]], label [[TMP22:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 8:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP7]], label [[TMP10:%.*]], label [[TMP23:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 9:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP9:%.*]] = icmp ugt i8 [[TMP6]], 15
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 10:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP9]], label [[TMP11:%.*]], label [[TMP16:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 11:
; RECOVER-ZERO-BASED-SHADOW-NEXT: call void asm sideeffect "brk #2356", "{x0}"(i64 [[TMP0]])
; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP21:%.*]]
-; RECOVER-ZERO-BASED-SHADOW: 11:
+; RECOVER-ZERO-BASED-SHADOW: 12:
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP12:%.*]] = and i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP13:%.*]] = trunc i64 [[TMP12]] to i8
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP14:%.*]] = add i8 [[TMP13]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP15:%.*]] = icmp uge i8 [[TMP14]], [[TMP6]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP10]], label [[TMP16:%.*]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 16:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP3]], 15
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP15]], label [[TMP11]], label [[TMP22:%.*]], !prof [[PROF1]]
+; RECOVER-ZERO-BASED-SHADOW: 17:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP17:%.*]] = or i64 [[TMP0]], 15
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP19:%.*]] = load i8, ptr [[TMP18]], align 1
; RECOVER-ZERO-BASED-SHADOW-NEXT: [[TMP20:%.*]] = icmp ne i8 [[TMP2]], [[TMP19]]
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP10]], label [[TMP21]], !prof [[PROF1]]
-; RECOVER-ZERO-BASED-SHADOW: 21:
-; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP22]]
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br i1 [[TMP20]], label [[TMP11]], label [[TMP21]], !prof [[PROF1]]
; RECOVER-ZERO-BASED-SHADOW: 22:
+; RECOVER-ZERO-BASED-SHADOW-NEXT: br label [[TMP23]]
+; RECOVER-ZERO-BASED-SHADOW: 23:
; RECOVER-ZERO-BASED-SHADOW-NEXT: store i128 [[B]], ptr [[A]], align 16
; RECOVER-ZERO-BASED-SHADOW-NEXT: ret void
;
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/exception-lifetime.ll b/llvm/test/Instrumentation/HWAddressSanitizer/exception-lifetime.ll
index 9e9fceb5eb4721..575a52a555a676 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/exception-lifetime.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/exception-lifetime.ll
@@ -42,7 +42,8 @@ define void @test() sanitize_hwaddress personality ptr @__gxx_personality_v0 {
; CHECK-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; CHECK-NEXT: [[TMP17:%.*]] = xor i64 [[TMP3]], 0
; CHECK-NEXT: [[TMP18:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP19:%.*]] = and i64 [[TMP18]], 72057594037927935
+; CHECK-NEXT: [[TMP24:%.*]] = shl i64 [[TMP18]], 8
+; CHECK-NEXT: [[TMP19:%.*]] = ashr i64 [[TMP24]], 8
; CHECK-NEXT: [[TMP20:%.*]] = shl i64 [[TMP17]], 56
; CHECK-NEXT: [[TMP21:%.*]] = or i64 [[TMP19]], [[TMP20]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP21]] to ptr
@@ -51,24 +52,26 @@ define void @test() sanitize_hwaddress personality ptr @__gxx_personality_v0 {
; CHECK-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr [[X]])
; CHECK-NEXT: [[TMP22:%.*]] = trunc i64 [[TMP17]] to i8
; CHECK-NEXT: [[TMP23:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP24:%.*]] = and i64 [[TMP23]], 72057594037927935
-; CHECK-NEXT: [[TMP25:%.*]] = lshr i64 [[TMP24]], 4
+; CHECK-NEXT: [[TMP29:%.*]] = shl i64 [[TMP23]], 8
+; CHECK-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP29]], 8
+; CHECK-NEXT: [[TMP25:%.*]] = ashr i64 [[TMP38]], 4
; CHECK-NEXT: [[TMP26:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP25]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP26]], i8 [[TMP22]], i64 1, i1 false)
; CHECK-NEXT: invoke void @mayFail(ptr [[X_HWASAN]])
-; CHECK-NEXT: to label [[INVOKE_CONT:%.*]] unwind label [[LPAD:%.*]]
+; CHECK-NEXT: to label [[INVOKE_CONT:%.*]] unwind label [[LPAD:%.*]]
; CHECK: invoke.cont:
; CHECK-NEXT: [[TMP27:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP28:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP29:%.*]] = and i64 [[TMP28]], 72057594037927935
-; CHECK-NEXT: [[TMP30:%.*]] = lshr i64 [[TMP29]], 4
+; CHECK-NEXT: [[TMP43:%.*]] = shl i64 [[TMP28]], 8
+; CHECK-NEXT: [[TMP44:%.*]] = ashr i64 [[TMP43]], 8
+; CHECK-NEXT: [[TMP30:%.*]] = ashr i64 [[TMP44]], 4
; CHECK-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP30]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP31]], i8 [[TMP27]], i64 1, i1 false)
; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr [[X]])
; CHECK-NEXT: ret void
; CHECK: lpad:
; CHECK-NEXT: [[TMP32:%.*]] = landingpad { ptr, i32 }
-; CHECK-NEXT: cleanup
+; CHECK-NEXT: cleanup
; CHECK-NEXT: [[TMP33:%.*]] = call i64 @llvm.read_register.i64(metadata [[META2:![0-9]+]])
; CHECK-NEXT: call void @__hwasan_handle_vfork(i64 [[TMP33]])
; CHECK-NEXT: [[TMP34:%.*]] = extractvalue { ptr, i32 } [[TMP32]], 0
@@ -80,8 +83,9 @@ define void @test() sanitize_hwaddress personality ptr @__gxx_personality_v0 {
; CHECK-NEXT: call void @onExcept(ptr [[X_HWASAN]])
; CHECK-NEXT: [[TMP36:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP37:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP38:%.*]] = and i64 [[TMP37]], 72057594037927935
-; CHECK-NEXT: [[TMP39:%.*]] = lshr i64 [[TMP38]], 4
+; CHECK-NEXT: [[TMP41:%.*]] = shl i64 [[TMP37]], 8
+; CHECK-NEXT: [[TMP42:%.*]] = ashr i64 [[TMP41]], 8
+; CHECK-NEXT: [[TMP39:%.*]] = ashr i64 [[TMP42]], 4
; CHECK-NEXT: [[TMP40:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP39]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP40]], i8 [[TMP36]], i64 1, i1 false)
; CHECK-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr [[X]])
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/kernel-alloca.ll b/llvm/test/Instrumentation/HWAddressSanitizer/kernel-alloca.ll
index 7652587ce4ec09..fba23da0f7a1e8 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/kernel-alloca.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/kernel-alloca.ll
@@ -21,22 +21,25 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; CHECK-NEXT: [[TMP3:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0
; CHECK-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP5:%.*]] = or i64 [[TMP4]], -72057594037927936
+; CHECK-NEXT: [[TMP11:%.*]] = shl i64 [[TMP4]], 8
+; CHECK-NEXT: [[TMP5:%.*]] = ashr i64 [[TMP11]], 8
; CHECK-NEXT: [[TMP6:%.*]] = shl i64 [[TMP3]], 56
; CHECK-NEXT: [[TMP7:%.*]] = or i64 [[TMP6]], 72057594037927935
; CHECK-NEXT: [[TMP8:%.*]] = and i64 [[TMP5]], [[TMP7]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP8]] to ptr
; CHECK-NEXT: [[TMP9:%.*]] = trunc i64 [[TMP3]] to i8
; CHECK-NEXT: [[TMP10:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP11:%.*]] = or i64 [[TMP10]], -72057594037927936
-; CHECK-NEXT: [[TMP12:%.*]] = lshr i64 [[TMP11]], 4
+; CHECK-NEXT: [[TMP16:%.*]] = shl i64 [[TMP10]], 8
+; CHECK-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP16]], 8
+; CHECK-NEXT: [[TMP12:%.*]] = ashr i64 [[TMP20]], 4
; CHECK-NEXT: [[TMP13:%.*]] = inttoptr i64 [[TMP12]] to ptr
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP13]], i8 [[TMP9]], i64 1, i1 false)
; CHECK-NEXT: call void @use32(ptr nonnull [[X_HWASAN]])
; CHECK-NEXT: [[TMP14:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP15:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP16:%.*]] = or i64 [[TMP15]], -72057594037927936
-; CHECK-NEXT: [[TMP17:%.*]] = lshr i64 [[TMP16]], 4
+; CHECK-NEXT: [[TMP21:%.*]] = shl i64 [[TMP15]], 8
+; CHECK-NEXT: [[TMP19:%.*]] = ashr i64 [[TMP21]], 8
+; CHECK-NEXT: [[TMP17:%.*]] = ashr i64 [[TMP19]], 4
; CHECK-NEXT: [[TMP18:%.*]] = inttoptr i64 [[TMP17]] to ptr
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP18]], i8 [[TMP14]], i64 1, i1 false)
; CHECK-NEXT: ret void
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/kernel.ll b/llvm/test/Instrumentation/HWAddressSanitizer/kernel.ll
index 3d89f5d87abbab..c9c21468215d3c 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/kernel.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/kernel.ll
@@ -15,8 +15,9 @@ define i8 @test_load(ptr %a) sanitize_hwaddress {
; CHECK: %[[A:[^ ]*]] = ptrtoint ptr %a to i64
; CHECK: %[[B:[^ ]*]] = lshr i64 %[[A]], 56
; CHECK: %[[PTRTAG:[^ ]*]] = trunc i64 %[[B]] to i8
-; CHECK: %[[C:[^ ]*]] = or i64 %[[A]], -72057594037927936
-; CHECK: %[[D:[^ ]*]] = lshr i64 %[[C]], 4
+; CHECK: %[[C:[^ ]*]] = shl i64 %[[A]], 8
+; CHECK: %[[UNTAG:[^ ]*]] = ashr i64 %[[C]], 8
+; CHECK: %[[D:[^ ]*]] = ashr i64 %[[UNTAG]], 4
; NOOFFSET: %[[E:[^ ]*]] = inttoptr i64 %[[D]] to ptr
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/prologue.ll b/llvm/test/Instrumentation/HWAddressSanitizer/prologue.ll
index 49f0bf739cb692..2e2250cbec5d24 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/prologue.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/prologue.ll
@@ -119,21 +119,24 @@ define void @test_alloca() sanitize_hwaddress {
; CHECK-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; CHECK-NEXT: [[TMP17:%.*]] = xor i64 [[TMP3]], 0
; CHECK-NEXT: [[TMP18:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP19:%.*]] = and i64 [[TMP18]], 72057594037927935
+; CHECK-NEXT: [[TMP24:%.*]] = shl i64 [[TMP18]], 8
+; CHECK-NEXT: [[TMP19:%.*]] = ashr i64 [[TMP24]], 8
; CHECK-NEXT: [[TMP20:%.*]] = shl i64 [[TMP17]], 56
; CHECK-NEXT: [[TMP21:%.*]] = or i64 [[TMP19]], [[TMP20]]
; CHECK-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP21]] to ptr
; CHECK-NEXT: [[TMP22:%.*]] = trunc i64 [[TMP17]] to i8
; CHECK-NEXT: [[TMP23:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP24:%.*]] = and i64 [[TMP23]], 72057594037927935
-; CHECK-NEXT: [[TMP25:%.*]] = lshr i64 [[TMP24]], 4
+; CHECK-NEXT: [[TMP29:%.*]] = shl i64 [[TMP23]], 8
+; CHECK-NEXT: [[TMP33:%.*]] = ashr i64 [[TMP29]], 8
+; CHECK-NEXT: [[TMP25:%.*]] = ashr i64 [[TMP33]], 4
; CHECK-NEXT: [[TMP26:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP25]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP26]], i8 [[TMP22]], i64 1, i1 false)
; CHECK-NEXT: call void @use(ptr [[X_HWASAN]])
; CHECK-NEXT: [[TMP27:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP28:%.*]] = ptrtoint ptr [[X]] to i64
-; CHECK-NEXT: [[TMP29:%.*]] = and i64 [[TMP28]], 72057594037927935
-; CHECK-NEXT: [[TMP30:%.*]] = lshr i64 [[TMP29]], 4
+; CHECK-NEXT: [[TMP34:%.*]] = shl i64 [[TMP28]], 8
+; CHECK-NEXT: [[TMP32:%.*]] = ashr i64 [[TMP34]], 8
+; CHECK-NEXT: [[TMP30:%.*]] = ashr i64 [[TMP32]], 4
; CHECK-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP30]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP31]], i8 [[TMP27]], i64 1, i1 false)
; CHECK-NEXT: ret void
@@ -165,21 +168,24 @@ define void @test_alloca() sanitize_hwaddress {
; NOIFUNC-TLS-HISTORY-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP17:%.*]] = xor i64 [[TMP3]], 0
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP18:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-TLS-HISTORY-NEXT: [[TMP19:%.*]] = and i64 [[TMP18]], 72057594037927935
+; NOIFUNC-TLS-HISTORY-NEXT: [[TMP24:%.*]] = shl i64 [[TMP18]], 8
+; NOIFUNC-TLS-HISTORY-NEXT: [[TMP19:%.*]] = ashr i64 [[TMP24]], 8
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP20:%.*]] = shl i64 [[TMP17]], 56
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP21:%.*]] = or i64 [[TMP19]], [[TMP20]]
; NOIFUNC-TLS-HISTORY-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP21]] to ptr
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP22:%.*]] = trunc i64 [[TMP17]] to i8
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP23:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-TLS-HISTORY-NEXT: [[TMP24:%.*]] = and i64 [[TMP23]], 72057594037927935
-; NOIFUNC-TLS-HISTORY-NEXT: [[TMP25:%.*]] = lshr i64 [[TMP24]], 4
+; NOIFUNC-TLS-HISTORY-NEXT: [[TMP29:%.*]] = shl i64 [[TMP23]], 8
+; NOIFUNC-TLS-HISTORY-NEXT: [[TMP33:%.*]] = ashr i64 [[TMP29]], 8
+; NOIFUNC-TLS-HISTORY-NEXT: [[TMP25:%.*]] = ashr i64 [[TMP33]], 4
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP26:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP25]]
; NOIFUNC-TLS-HISTORY-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP26]], i8 [[TMP22]], i64 1, i1 false)
; NOIFUNC-TLS-HISTORY-NEXT: call void @use(ptr [[X_HWASAN]])
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP27:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP28:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-TLS-HISTORY-NEXT: [[TMP29:%.*]] = and i64 [[TMP28]], 72057594037927935
-; NOIFUNC-TLS-HISTORY-NEXT: [[TMP30:%.*]] = lshr i64 [[TMP29]], 4
+; NOIFUNC-TLS-HISTORY-NEXT: [[TMP34:%.*]] = shl i64 [[TMP28]], 8
+; NOIFUNC-TLS-HISTORY-NEXT: [[TMP32:%.*]] = ashr i64 [[TMP34]], 8
+; NOIFUNC-TLS-HISTORY-NEXT: [[TMP30:%.*]] = ashr i64 [[TMP32]], 4
; NOIFUNC-TLS-HISTORY-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP30]]
; NOIFUNC-TLS-HISTORY-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP31]], i8 [[TMP27]], i64 1, i1 false)
; NOIFUNC-TLS-HISTORY-NEXT: ret void
@@ -196,21 +202,24 @@ define void @test_alloca() sanitize_hwaddress {
; NOIFUNC-TLS-NOHISTORY-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP3:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP5:%.*]] = and i64 [[TMP4]], 72057594037927935
+; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP10:%.*]] = shl i64 [[TMP4]], 8
+; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP5:%.*]] = ashr i64 [[TMP10]], 8
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP6:%.*]] = shl i64 [[TMP3]], 56
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP7:%.*]] = or i64 [[TMP5]], [[TMP6]]
; NOIFUNC-TLS-NOHISTORY-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP7]] to ptr
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP8:%.*]] = trunc i64 [[TMP3]] to i8
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP9:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP10:%.*]] = and i64 [[TMP9]], 72057594037927935
-; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP11:%.*]] = lshr i64 [[TMP10]], 4
+; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP15:%.*]] = shl i64 [[TMP9]], 8
+; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP19:%.*]] = ashr i64 [[TMP15]], 8
+; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP11:%.*]] = ashr i64 [[TMP19]], 4
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP12:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP11]]
; NOIFUNC-TLS-NOHISTORY-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP12]], i8 [[TMP8]], i64 1, i1 false)
; NOIFUNC-TLS-NOHISTORY-NEXT: call void @use(ptr [[X_HWASAN]])
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP13:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP14:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP15:%.*]] = and i64 [[TMP14]], 72057594037927935
-; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP16:%.*]] = lshr i64 [[TMP15]], 4
+; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP20:%.*]] = shl i64 [[TMP14]], 8
+; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP18:%.*]] = ashr i64 [[TMP20]], 8
+; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP16:%.*]] = ashr i64 [[TMP18]], 4
; NOIFUNC-TLS-NOHISTORY-NEXT: [[TMP17:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP16]]
; NOIFUNC-TLS-NOHISTORY-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP17]], i8 [[TMP13]], i64 1, i1 false)
; NOIFUNC-TLS-NOHISTORY-NEXT: ret void
@@ -227,21 +236,24 @@ define void @test_alloca() sanitize_hwaddress {
; NOIFUNC-NOTLS-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; NOIFUNC-NOTLS-NEXT: [[TMP4:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0
; NOIFUNC-NOTLS-NEXT: [[TMP5:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-NOTLS-NEXT: [[TMP6:%.*]] = and i64 [[TMP5]], 72057594037927935
+; NOIFUNC-NOTLS-NEXT: [[TMP11:%.*]] = shl i64 [[TMP5]], 8
+; NOIFUNC-NOTLS-NEXT: [[TMP6:%.*]] = ashr i64 [[TMP11]], 8
; NOIFUNC-NOTLS-NEXT: [[TMP7:%.*]] = shl i64 [[TMP4]], 56
; NOIFUNC-NOTLS-NEXT: [[TMP8:%.*]] = or i64 [[TMP6]], [[TMP7]]
; NOIFUNC-NOTLS-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP8]] to ptr
; NOIFUNC-NOTLS-NEXT: [[TMP9:%.*]] = trunc i64 [[TMP4]] to i8
; NOIFUNC-NOTLS-NEXT: [[TMP10:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-NOTLS-NEXT: [[TMP11:%.*]] = and i64 [[TMP10]], 72057594037927935
-; NOIFUNC-NOTLS-NEXT: [[TMP12:%.*]] = lshr i64 [[TMP11]], 4
+; NOIFUNC-NOTLS-NEXT: [[TMP16:%.*]] = shl i64 [[TMP10]], 8
+; NOIFUNC-NOTLS-NEXT: [[TMP20:%.*]] = ashr i64 [[TMP16]], 8
+; NOIFUNC-NOTLS-NEXT: [[TMP12:%.*]] = ashr i64 [[TMP20]], 4
; NOIFUNC-NOTLS-NEXT: [[TMP13:%.*]] = getelementptr i8, ptr [[TMP0]], i64 [[TMP12]]
; NOIFUNC-NOTLS-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP13]], i8 [[TMP9]], i64 1, i1 false)
; NOIFUNC-NOTLS-NEXT: call void @use(ptr [[X_HWASAN]])
; NOIFUNC-NOTLS-NEXT: [[TMP14:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; NOIFUNC-NOTLS-NEXT: [[TMP15:%.*]] = ptrtoint ptr [[X]] to i64
-; NOIFUNC-NOTLS-NEXT: [[TMP16:%.*]] = and i64 [[TMP15]], 72057594037927935
-; NOIFUNC-NOTLS-NEXT: [[TMP17:%.*]] = lshr i64 [[TMP16]], 4
+; NOIFUNC-NOTLS-NEXT: [[TMP21:%.*]] = shl i64 [[TMP15]], 8
+; NOIFUNC-NOTLS-NEXT: [[TMP19:%.*]] = ashr i64 [[TMP21]], 8
+; NOIFUNC-NOTLS-NEXT: [[TMP17:%.*]] = ashr i64 [[TMP19]], 4
; NOIFUNC-NOTLS-NEXT: [[TMP18:%.*]] = getelementptr i8, ptr [[TMP0]], i64 [[TMP17]]
; NOIFUNC-NOTLS-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP18]], i8 [[TMP14]], i64 1, i1 false)
; NOIFUNC-NOTLS-NEXT: ret void
@@ -258,21 +270,24 @@ define void @test_alloca() sanitize_hwaddress {
; IFUNC-NOTLS-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; IFUNC-NOTLS-NEXT: [[TMP3:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0
; IFUNC-NOTLS-NEXT: [[TMP4:%.*]] = ptrtoint ptr [[X]] to i64
-; IFUNC-NOTLS-NEXT: [[TMP5:%.*]] = and i64 [[TMP4]], 72057594037927935
+; IFUNC-NOTLS-NEXT: [[TMP10:%.*]] = shl i64 [[TMP4]], 8
+; IFUNC-NOTLS-NEXT: [[TMP5:%.*]] = ashr i64 [[TMP10]], 8
; IFUNC-NOTLS-NEXT: [[TMP6:%.*]] = shl i64 [[TMP3]], 56
; IFUNC-NOTLS-NEXT: [[TMP7:%.*]] = or i64 [[TMP5]], [[TMP6]]
; IFUNC-NOTLS-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP7]] to ptr
; IFUNC-NOTLS-NEXT: [[TMP8:%.*]] = trunc i64 [[TMP3]] to i8
; IFUNC-NOTLS-NEXT: [[TMP9:%.*]] = ptrtoint ptr [[X]] to i64
-; IFUNC-NOTLS-NEXT: [[TMP10:%.*]] = and i64 [[TMP9]], 72057594037927935
-; IFUNC-NOTLS-NEXT: [[TMP11:%.*]] = lshr i64 [[TMP10]], 4
+; IFUNC-NOTLS-NEXT: [[TMP15:%.*]] = shl i64 [[TMP9]], 8
+; IFUNC-NOTLS-NEXT: [[TMP19:%.*]] = ashr i64 [[TMP15]], 8
+; IFUNC-NOTLS-NEXT: [[TMP11:%.*]] = ashr i64 [[TMP19]], 4
; IFUNC-NOTLS-NEXT: [[TMP12:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP11]]
; IFUNC-NOTLS-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP12]], i8 [[TMP8]], i64 1, i1 false)
; IFUNC-NOTLS-NEXT: call void @use(ptr [[X_HWASAN]])
; IFUNC-NOTLS-NEXT: [[TMP13:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; IFUNC-NOTLS-NEXT: [[TMP14:%.*]] = ptrtoint ptr [[X]] to i64
-; IFUNC-NOTLS-NEXT: [[TMP15:%.*]] = and i64 [[TMP14]], 72057594037927935
-; IFUNC-NOTLS-NEXT: [[TMP16:%.*]] = lshr i64 [[TMP15]], 4
+; IFUNC-NOTLS-NEXT: [[TMP20:%.*]] = shl i64 [[TMP14]], 8
+; IFUNC-NOTLS-NEXT: [[TMP18:%.*]] = ashr i64 [[TMP20]], 8
+; IFUNC-NOTLS-NEXT: [[TMP16:%.*]] = ashr i64 [[TMP18]], 4
; IFUNC-NOTLS-NEXT: [[TMP17:%.*]] = getelementptr i8, ptr [[DOTHWASAN_SHADOW]], i64 [[TMP16]]
; IFUNC-NOTLS-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP17]], i8 [[TMP13]], i64 1, i1 false)
; IFUNC-NOTLS-NEXT: ret void
@@ -300,14 +315,16 @@ define void @test_alloca() sanitize_hwaddress {
; FUCHSIA-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; FUCHSIA-NEXT: [[TMP13:%.*]] = xor i64 [[TMP1]], 0
; FUCHSIA-NEXT: [[TMP14:%.*]] = ptrtoint ptr [[X]] to i64
-; FUCHSIA-NEXT: [[TMP15:%.*]] = and i64 [[TMP14]], 72057594037927935
+; FUCHSIA-NEXT: [[TMP20:%.*]] = shl i64 [[TMP14]], 8
+; FUCHSIA-NEXT: [[TMP15:%.*]] = ashr i64 [[TMP20]], 8
; FUCHSIA-NEXT: [[TMP16:%.*]] = shl i64 [[TMP13]], 56
; FUCHSIA-NEXT: [[TMP17:%.*]] = or i64 [[TMP15]], [[TMP16]]
; FUCHSIA-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP17]] to ptr
; FUCHSIA-NEXT: [[TMP18:%.*]] = trunc i64 [[TMP13]] to i8
; FUCHSIA-NEXT: [[TMP19:%.*]] = ptrtoint ptr [[X]] to i64
-; FUCHSIA-NEXT: [[TMP20:%.*]] = and i64 [[TMP19]], 72057594037927935
-; FUCHSIA-NEXT: [[TMP21:%.*]] = lshr i64 [[TMP20]], 4
+; FUCHSIA-NEXT: [[TMP27:%.*]] = shl i64 [[TMP19]], 8
+; FUCHSIA-NEXT: [[TMP31:%.*]] = ashr i64 [[TMP27]], 8
+; FUCHSIA-NEXT: [[TMP21:%.*]] = ashr i64 [[TMP31]], 4
; FUCHSIA-NEXT: [[TMP22:%.*]] = inttoptr i64 [[TMP21]] to ptr
; FUCHSIA-NEXT: [[TMP23:%.*]] = getelementptr i8, ptr [[TMP22]], i32 0
; FUCHSIA-NEXT: store i8 4, ptr [[TMP23]], align 1
@@ -316,8 +333,9 @@ define void @test_alloca() sanitize_hwaddress {
; FUCHSIA-NEXT: call void @use(ptr [[X_HWASAN]])
; FUCHSIA-NEXT: [[TMP25:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; FUCHSIA-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[X]] to i64
-; FUCHSIA-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; FUCHSIA-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; FUCHSIA-NEXT: [[TMP32:%.*]] = shl i64 [[TMP26]], 8
+; FUCHSIA-NEXT: [[TMP30:%.*]] = ashr i64 [[TMP32]], 8
+; FUCHSIA-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP30]], 4
; FUCHSIA-NEXT: [[TMP29:%.*]] = inttoptr i64 [[TMP28]] to ptr
; FUCHSIA-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; FUCHSIA-NEXT: ret void
@@ -338,14 +356,16 @@ define void @test_alloca() sanitize_hwaddress {
; FUCHSIA-LIBCALL-NEXT: [[X:%.*]] = alloca { i32, [12 x i8] }, align 16
; FUCHSIA-LIBCALL-NEXT: [[TMP6:%.*]] = xor i64 [[HWASAN_STACK_BASE_TAG]], 0
; FUCHSIA-LIBCALL-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[X]] to i64
-; FUCHSIA-LIBCALL-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], 72057594037927935
+; FUCHSIA-LIBCALL-NEXT: [[TMP13:%.*]] = shl i64 [[TMP7]], 8
+; FUCHSIA-LIBCALL-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP13]], 8
; FUCHSIA-LIBCALL-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 56
; FUCHSIA-LIBCALL-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; FUCHSIA-LIBCALL-NEXT: [[X_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
; FUCHSIA-LIBCALL-NEXT: [[TMP11:%.*]] = trunc i64 [[TMP6]] to i8
; FUCHSIA-LIBCALL-NEXT: [[TMP12:%.*]] = ptrtoint ptr [[X]] to i64
-; FUCHSIA-LIBCALL-NEXT: [[TMP13:%.*]] = and i64 [[TMP12]], 72057594037927935
-; FUCHSIA-LIBCALL-NEXT: [[TMP14:%.*]] = lshr i64 [[TMP13]], 4
+; FUCHSIA-LIBCALL-NEXT: [[TMP20:%.*]] = shl i64 [[TMP12]], 8
+; FUCHSIA-LIBCALL-NEXT: [[TMP24:%.*]] = ashr i64 [[TMP20]], 8
+; FUCHSIA-LIBCALL-NEXT: [[TMP14:%.*]] = ashr i64 [[TMP24]], 4
; FUCHSIA-LIBCALL-NEXT: [[TMP15:%.*]] = inttoptr i64 [[TMP14]] to ptr
; FUCHSIA-LIBCALL-NEXT: [[TMP16:%.*]] = getelementptr i8, ptr [[TMP15]], i32 0
; FUCHSIA-LIBCALL-NEXT: store i8 4, ptr [[TMP16]], align 1
@@ -354,8 +374,9 @@ define void @test_alloca() sanitize_hwaddress {
; FUCHSIA-LIBCALL-NEXT: call void @use(ptr [[X_HWASAN]])
; FUCHSIA-LIBCALL-NEXT: [[TMP18:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; FUCHSIA-LIBCALL-NEXT: [[TMP19:%.*]] = ptrtoint ptr [[X]] to i64
-; FUCHSIA-LIBCALL-NEXT: [[TMP20:%.*]] = and i64 [[TMP19]], 72057594037927935
-; FUCHSIA-LIBCALL-NEXT: [[TMP21:%.*]] = lshr i64 [[TMP20]], 4
+; FUCHSIA-LIBCALL-NEXT: [[TMP25:%.*]] = shl i64 [[TMP19]], 8
+; FUCHSIA-LIBCALL-NEXT: [[TMP23:%.*]] = ashr i64 [[TMP25]], 8
+; FUCHSIA-LIBCALL-NEXT: [[TMP21:%.*]] = ashr i64 [[TMP23]], 4
; FUCHSIA-LIBCALL-NEXT: [[TMP22:%.*]] = inttoptr i64 [[TMP21]] to ptr
; FUCHSIA-LIBCALL-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP22]], i8 [[TMP18]], i64 1, i1 false)
; FUCHSIA-LIBCALL-NEXT: ret void
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/use-after-scope-setjmp.ll b/llvm/test/Instrumentation/HWAddressSanitizer/use-after-scope-setjmp.ll
index 62fd7a16715693..cb430779c156f6 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/use-after-scope-setjmp.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/use-after-scope-setjmp.ll
@@ -36,14 +36,16 @@ define dso_local noundef i1 @_Z6targetv() sanitize_hwaddress {
; CHECK-NEXT: [[BUF:%.*]] = alloca [4096 x i8], align 16
; CHECK-NEXT: [[TMP17:%.*]] = xor i64 [[TMP3]], 0
; CHECK-NEXT: [[TMP18:%.*]] = ptrtoint ptr [[BUF]] to i64
-; CHECK-NEXT: [[TMP19:%.*]] = and i64 [[TMP18]], 72057594037927935
+; CHECK-NEXT: [[TMP24:%.*]] = shl i64 [[TMP18]], 8
+; CHECK-NEXT: [[TMP19:%.*]] = ashr i64 [[TMP24]], 8
; CHECK-NEXT: [[TMP20:%.*]] = shl i64 [[TMP17]], 56
; CHECK-NEXT: [[TMP21:%.*]] = or i64 [[TMP19]], [[TMP20]]
; CHECK-NEXT: [[BUF_HWASAN:%.*]] = inttoptr i64 [[TMP21]] to ptr
; CHECK-NEXT: [[TMP22:%.*]] = trunc i64 [[TMP17]] to i8
; CHECK-NEXT: [[TMP23:%.*]] = ptrtoint ptr [[BUF]] to i64
-; CHECK-NEXT: [[TMP24:%.*]] = and i64 [[TMP23]], 72057594037927935
-; CHECK-NEXT: [[TMP25:%.*]] = lshr i64 [[TMP24]], 4
+; CHECK-NEXT: [[TMP29:%.*]] = shl i64 [[TMP23]], 8
+; CHECK-NEXT: [[TMP33:%.*]] = ashr i64 [[TMP29]], 8
+; CHECK-NEXT: [[TMP25:%.*]] = ashr i64 [[TMP33]], 4
; CHECK-NEXT: [[TMP26:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP25]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP26]], i8 [[TMP22]], i64 256, i1 false)
; CHECK-NEXT: [[CALL:%.*]] = call i32 @setjmp(ptr noundef @jbuf)
@@ -61,8 +63,9 @@ define dso_local noundef i1 @_Z6targetv() sanitize_hwaddress {
; CHECK-NEXT: [[RETVAL_0:%.*]] = phi i1 [ true, [[WHILE_BODY]] ], [ true, [[SW_BB1]] ], [ false, [[ENTRY:%.*]] ]
; CHECK-NEXT: [[TMP27:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; CHECK-NEXT: [[TMP28:%.*]] = ptrtoint ptr [[BUF]] to i64
-; CHECK-NEXT: [[TMP29:%.*]] = and i64 [[TMP28]], 72057594037927935
-; CHECK-NEXT: [[TMP30:%.*]] = lshr i64 [[TMP29]], 4
+; CHECK-NEXT: [[TMP34:%.*]] = shl i64 [[TMP28]], 8
+; CHECK-NEXT: [[TMP32:%.*]] = ashr i64 [[TMP34]], 8
+; CHECK-NEXT: [[TMP30:%.*]] = ashr i64 [[TMP32]], 4
; CHECK-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP16]], i64 [[TMP30]]
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP31]], i8 [[TMP27]], i64 256, i1 false)
; CHECK-NEXT: ret i1 [[RETVAL_0]]
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/use-after-scope.ll b/llvm/test/Instrumentation/HWAddressSanitizer/use-after-scope.ll
index 643b2a8c274cf1..04bd5da0aec4a9 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/use-after-scope.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/use-after-scope.ll
@@ -34,12 +34,13 @@ define dso_local i32 @standard_lifetime() local_unnamed_addr sanitize_hwaddress
; X86-SCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-SCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-SCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-SCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-SCOPE-NEXT: [[TMP16:%.*]] = shl i64 [[TMP7]], 7
+; X86-SCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP16]], 7
; X86-SCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-SCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
; X86-SCOPE-NEXT: br label [[TMP11:%.*]]
-; X86-SCOPE: 11:
+; X86-SCOPE: 12:
; X86-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP4]])
; X86-SCOPE-NEXT: [[TMP12:%.*]] = trunc i64 [[TMP6]] to i8
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP12]], i64 16)
@@ -48,7 +49,7 @@ define dso_local i32 @standard_lifetime() local_unnamed_addr sanitize_hwaddress
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP14]], i64 16)
; X86-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP4]])
; X86-SCOPE-NEXT: br i1 [[TMP13]], label [[TMP15:%.*]], label [[TMP11]]
-; X86-SCOPE: 15:
+; X86-SCOPE: 16:
; X86-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; X86-SCOPE-NEXT: ret i32 0
;
@@ -62,17 +63,18 @@ define dso_local i32 @standard_lifetime() local_unnamed_addr sanitize_hwaddress
; X86-NOSCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-NOSCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-NOSCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-NOSCOPE-NEXT: [[TMP16:%.*]] = shl i64 [[TMP7]], 7
+; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP16]], 7
; X86-NOSCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-NOSCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
; X86-NOSCOPE-NEXT: [[TMP11:%.*]] = trunc i64 [[TMP6]] to i8
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP11]], i64 16)
; X86-NOSCOPE-NEXT: br label [[TMP12:%.*]]
-; X86-NOSCOPE: 12:
+; X86-NOSCOPE: 13:
; X86-NOSCOPE-NEXT: [[TMP13:%.*]] = tail call i1 (...) @cond()
; X86-NOSCOPE-NEXT: br i1 [[TMP13]], label [[TMP14:%.*]], label [[TMP12]]
-; X86-NOSCOPE: 14:
+; X86-NOSCOPE: 15:
; X86-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; X86-NOSCOPE-NEXT: [[TMP15:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP15]], i64 16)
@@ -104,29 +106,32 @@ define dso_local i32 @standard_lifetime() local_unnamed_addr sanitize_hwaddress
; AARCH64-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP28]], 8
; AARCH64-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SCOPE-NEXT: br label [[TMP25:%.*]]
-; AARCH64-SCOPE: 25:
+; AARCH64-SCOPE: 26:
; AARCH64-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SCOPE-NEXT: [[TMP26:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SCOPE-NEXT: [[TMP27:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = and i64 [[TMP27]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP29:%.*]] = lshr i64 [[TMP28]], 4
+; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = shl i64 [[TMP27]], 8
+; AARCH64-SCOPE-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP34]], 8
+; AARCH64-SCOPE-NEXT: [[TMP29:%.*]] = ashr i64 [[TMP38]], 4
; AARCH64-SCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP29]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP30]], i8 [[TMP26]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: [[TMP31:%.*]] = tail call i1 (...) @cond()
; AARCH64-SCOPE-NEXT: [[TMP32:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SCOPE-NEXT: [[TMP33:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = and i64 [[TMP33]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = lshr i64 [[TMP34]], 4
+; AARCH64-SCOPE-NEXT: [[TMP39:%.*]] = shl i64 [[TMP33]], 8
+; AARCH64-SCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP39]], 8
+; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-SCOPE-NEXT: [[TMP36:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP35]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP36]], i8 [[TMP32]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SCOPE-NEXT: br i1 [[TMP31]], label [[TMP37:%.*]], label [[TMP25]]
-; AARCH64-SCOPE: 37:
+; AARCH64-SCOPE: 40:
; AARCH64-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SCOPE-NEXT: ret i32 0
;
@@ -156,26 +161,29 @@ define dso_local i32 @standard_lifetime() local_unnamed_addr sanitize_hwaddress
; AARCH64-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP35:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP39:%.*]] = ashr i64 [[TMP35]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP39]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: br label [[TMP30:%.*]]
-; AARCH64-NOSCOPE: 30:
+; AARCH64-NOSCOPE: 32:
; AARCH64-NOSCOPE-NEXT: [[TMP31:%.*]] = tail call i1 (...) @cond()
; AARCH64-NOSCOPE-NEXT: br i1 [[TMP31]], label [[TMP32:%.*]], label [[TMP30]]
-; AARCH64-NOSCOPE: 32:
+; AARCH64-NOSCOPE: 34:
; AARCH64-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-NOSCOPE-NEXT: [[TMP33:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP34:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP35:%.*]] = and i64 [[TMP34]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP36:%.*]] = lshr i64 [[TMP35]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP40:%.*]] = shl i64 [[TMP34]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP40]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP36:%.*]] = ashr i64 [[TMP38]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP37:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP36]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP37]], i8 [[TMP33]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: ret i32 0
@@ -206,17 +214,19 @@ define dso_local i32 @standard_lifetime() local_unnamed_addr sanitize_hwaddress
; AARCH64-SHORT-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP28]], 8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-SCOPE-NEXT: br label [[TMP25:%.*]]
-; AARCH64-SHORT-SCOPE: 25:
+; AARCH64-SHORT-SCOPE: 26:
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SHORT-SCOPE-NEXT: [[TMP26:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP27:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = and i64 [[TMP27]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP29:%.*]] = lshr i64 [[TMP28]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = shl i64 [[TMP27]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP36]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP29:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP29]]
; AARCH64-SHORT-SCOPE-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP30]], i32 0
; AARCH64-SHORT-SCOPE-NEXT: store i8 1, ptr [[TMP31]], align 1
@@ -225,13 +235,14 @@ define dso_local i32 @standard_lifetime() local_unnamed_addr sanitize_hwaddress
; AARCH64-SHORT-SCOPE-NEXT: [[TMP33:%.*]] = tail call i1 (...) @cond()
; AARCH64-SHORT-SCOPE-NEXT: [[TMP34:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP35:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = and i64 [[TMP35]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = lshr i64 [[TMP36]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP41:%.*]] = shl i64 [[TMP35]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP42:%.*]] = ashr i64 [[TMP41]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = ashr i64 [[TMP42]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP38:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP37]]
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP38]], i8 [[TMP34]], i64 1, i1 false)
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SHORT-SCOPE-NEXT: br i1 [[TMP33]], label [[TMP39:%.*]], label [[TMP25]]
-; AARCH64-SHORT-SCOPE: 39:
+; AARCH64-SHORT-SCOPE: 42:
; AARCH64-SHORT-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-SCOPE-NEXT: ret i32 0
;
@@ -261,29 +272,32 @@ define dso_local i32 @standard_lifetime() local_unnamed_addr sanitize_hwaddress
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP37:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP41:%.*]] = ashr i64 [[TMP37]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP41]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP29]], i32 0
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 1, ptr [[TMP30]], align 1
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP18]], i32 15
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 [[TMP25]], ptr [[TMP31]], align 1
; AARCH64-SHORT-NOSCOPE-NEXT: br label [[TMP32:%.*]]
-; AARCH64-SHORT-NOSCOPE: 32:
+; AARCH64-SHORT-NOSCOPE: 34:
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP33:%.*]] = tail call i1 (...) @cond()
; AARCH64-SHORT-NOSCOPE-NEXT: br i1 [[TMP33]], label [[TMP34:%.*]], label [[TMP32]]
-; AARCH64-SHORT-NOSCOPE: 34:
+; AARCH64-SHORT-NOSCOPE: 36:
; AARCH64-SHORT-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP35:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP36:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP37:%.*]] = and i64 [[TMP36]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP38:%.*]] = lshr i64 [[TMP37]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP42:%.*]] = shl i64 [[TMP36]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP42]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP39:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP38]]
; AARCH64-SHORT-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP39]], i8 [[TMP35]], i64 1, i1 false)
; AARCH64-SHORT-NOSCOPE-NEXT: ret i32 0
@@ -315,12 +329,13 @@ define dso_local i32 @standard_lifetime_optnone() local_unnamed_addr optnone noi
; X86-SCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-SCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-SCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-SCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-SCOPE-NEXT: [[TMP16:%.*]] = shl i64 [[TMP7]], 7
+; X86-SCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP16]], 7
; X86-SCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-SCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
; X86-SCOPE-NEXT: br label [[TMP11:%.*]]
-; X86-SCOPE: 11:
+; X86-SCOPE: 12:
; X86-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP4]])
; X86-SCOPE-NEXT: [[TMP12:%.*]] = trunc i64 [[TMP6]] to i8
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP12]], i64 16)
@@ -329,7 +344,7 @@ define dso_local i32 @standard_lifetime_optnone() local_unnamed_addr optnone noi
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP14]], i64 16)
; X86-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP4]])
; X86-SCOPE-NEXT: br i1 [[TMP13]], label [[TMP15:%.*]], label [[TMP11]]
-; X86-SCOPE: 15:
+; X86-SCOPE: 16:
; X86-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; X86-SCOPE-NEXT: ret i32 0
;
@@ -343,17 +358,18 @@ define dso_local i32 @standard_lifetime_optnone() local_unnamed_addr optnone noi
; X86-NOSCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-NOSCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-NOSCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-NOSCOPE-NEXT: [[TMP16:%.*]] = shl i64 [[TMP7]], 7
+; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP16]], 7
; X86-NOSCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-NOSCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
; X86-NOSCOPE-NEXT: [[TMP11:%.*]] = trunc i64 [[TMP6]] to i8
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP11]], i64 16)
; X86-NOSCOPE-NEXT: br label [[TMP12:%.*]]
-; X86-NOSCOPE: 12:
+; X86-NOSCOPE: 13:
; X86-NOSCOPE-NEXT: [[TMP13:%.*]] = tail call i1 (...) @cond()
; X86-NOSCOPE-NEXT: br i1 [[TMP13]], label [[TMP14:%.*]], label [[TMP12]]
-; X86-NOSCOPE: 14:
+; X86-NOSCOPE: 15:
; X86-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; X86-NOSCOPE-NEXT: [[TMP15:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP15]], i64 16)
@@ -385,29 +401,32 @@ define dso_local i32 @standard_lifetime_optnone() local_unnamed_addr optnone noi
; AARCH64-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP28]], 8
; AARCH64-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SCOPE-NEXT: br label [[TMP25:%.*]]
-; AARCH64-SCOPE: 25:
+; AARCH64-SCOPE: 26:
; AARCH64-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SCOPE-NEXT: [[TMP26:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SCOPE-NEXT: [[TMP27:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = and i64 [[TMP27]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP29:%.*]] = lshr i64 [[TMP28]], 4
+; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = shl i64 [[TMP27]], 8
+; AARCH64-SCOPE-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP34]], 8
+; AARCH64-SCOPE-NEXT: [[TMP29:%.*]] = ashr i64 [[TMP38]], 4
; AARCH64-SCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP29]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP30]], i8 [[TMP26]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: [[TMP31:%.*]] = tail call i1 (...) @cond()
; AARCH64-SCOPE-NEXT: [[TMP32:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SCOPE-NEXT: [[TMP33:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = and i64 [[TMP33]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = lshr i64 [[TMP34]], 4
+; AARCH64-SCOPE-NEXT: [[TMP39:%.*]] = shl i64 [[TMP33]], 8
+; AARCH64-SCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP39]], 8
+; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-SCOPE-NEXT: [[TMP36:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP35]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP36]], i8 [[TMP32]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SCOPE-NEXT: br i1 [[TMP31]], label [[TMP37:%.*]], label [[TMP25]]
-; AARCH64-SCOPE: 37:
+; AARCH64-SCOPE: 40:
; AARCH64-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SCOPE-NEXT: ret i32 0
;
@@ -437,26 +456,29 @@ define dso_local i32 @standard_lifetime_optnone() local_unnamed_addr optnone noi
; AARCH64-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP35:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP39:%.*]] = ashr i64 [[TMP35]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP39]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: br label [[TMP30:%.*]]
-; AARCH64-NOSCOPE: 30:
+; AARCH64-NOSCOPE: 32:
; AARCH64-NOSCOPE-NEXT: [[TMP31:%.*]] = tail call i1 (...) @cond()
; AARCH64-NOSCOPE-NEXT: br i1 [[TMP31]], label [[TMP32:%.*]], label [[TMP30]]
-; AARCH64-NOSCOPE: 32:
+; AARCH64-NOSCOPE: 34:
; AARCH64-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-NOSCOPE-NEXT: [[TMP33:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP34:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP35:%.*]] = and i64 [[TMP34]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP36:%.*]] = lshr i64 [[TMP35]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP40:%.*]] = shl i64 [[TMP34]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP40]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP36:%.*]] = ashr i64 [[TMP38]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP37:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP36]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP37]], i8 [[TMP33]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: ret i32 0
@@ -487,17 +509,19 @@ define dso_local i32 @standard_lifetime_optnone() local_unnamed_addr optnone noi
; AARCH64-SHORT-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP28]], 8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-SCOPE-NEXT: br label [[TMP25:%.*]]
-; AARCH64-SHORT-SCOPE: 25:
+; AARCH64-SHORT-SCOPE: 26:
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SHORT-SCOPE-NEXT: [[TMP26:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP27:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = and i64 [[TMP27]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP29:%.*]] = lshr i64 [[TMP28]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = shl i64 [[TMP27]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP36]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP29:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP29]]
; AARCH64-SHORT-SCOPE-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP30]], i32 0
; AARCH64-SHORT-SCOPE-NEXT: store i8 1, ptr [[TMP31]], align 1
@@ -506,13 +530,14 @@ define dso_local i32 @standard_lifetime_optnone() local_unnamed_addr optnone noi
; AARCH64-SHORT-SCOPE-NEXT: [[TMP33:%.*]] = tail call i1 (...) @cond()
; AARCH64-SHORT-SCOPE-NEXT: [[TMP34:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP35:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = and i64 [[TMP35]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = lshr i64 [[TMP36]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP41:%.*]] = shl i64 [[TMP35]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP42:%.*]] = ashr i64 [[TMP41]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = ashr i64 [[TMP42]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP38:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP37]]
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP38]], i8 [[TMP34]], i64 1, i1 false)
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SHORT-SCOPE-NEXT: br i1 [[TMP33]], label [[TMP39:%.*]], label [[TMP25]]
-; AARCH64-SHORT-SCOPE: 39:
+; AARCH64-SHORT-SCOPE: 42:
; AARCH64-SHORT-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-SCOPE-NEXT: ret i32 0
;
@@ -542,29 +567,32 @@ define dso_local i32 @standard_lifetime_optnone() local_unnamed_addr optnone noi
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP37:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP41:%.*]] = ashr i64 [[TMP37]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP41]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP29]], i32 0
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 1, ptr [[TMP30]], align 1
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP31:%.*]] = getelementptr i8, ptr [[TMP18]], i32 15
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 [[TMP25]], ptr [[TMP31]], align 1
; AARCH64-SHORT-NOSCOPE-NEXT: br label [[TMP32:%.*]]
-; AARCH64-SHORT-NOSCOPE: 32:
+; AARCH64-SHORT-NOSCOPE: 34:
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP33:%.*]] = tail call i1 (...) @cond()
; AARCH64-SHORT-NOSCOPE-NEXT: br i1 [[TMP33]], label [[TMP34:%.*]], label [[TMP32]]
-; AARCH64-SHORT-NOSCOPE: 34:
+; AARCH64-SHORT-NOSCOPE: 36:
; AARCH64-SHORT-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP35:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP36:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP37:%.*]] = and i64 [[TMP36]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP38:%.*]] = lshr i64 [[TMP37]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP42:%.*]] = shl i64 [[TMP36]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP42]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP39:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP38]]
; AARCH64-SHORT-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP39]], i8 [[TMP35]], i64 1, i1 false)
; AARCH64-SHORT-NOSCOPE-NEXT: ret i32 0
@@ -596,7 +624,8 @@ define dso_local i32 @multiple_lifetimes() local_unnamed_addr sanitize_hwaddress
; X86-SCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-SCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-SCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-SCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-SCOPE-NEXT: [[TMP13:%.*]] = shl i64 [[TMP7]], 7
+; X86-SCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP13]], 7
; X86-SCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-SCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
@@ -618,7 +647,8 @@ define dso_local i32 @multiple_lifetimes() local_unnamed_addr sanitize_hwaddress
; X86-NOSCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-NOSCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-NOSCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-NOSCOPE-NEXT: [[TMP13:%.*]] = shl i64 [[TMP7]], 7
+; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP13]], 7
; X86-NOSCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-NOSCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
@@ -656,22 +686,25 @@ define dso_local i32 @multiple_lifetimes() local_unnamed_addr sanitize_hwaddress
; AARCH64-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SCOPE-NEXT: [[TMP32:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SCOPE-NEXT: [[TMP36:%.*]] = ashr i64 [[TMP32]], 8
+; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP36]], 4
; AARCH64-SCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SCOPE-NEXT: [[TMP30:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SCOPE-NEXT: [[TMP31:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP32:%.*]] = and i64 [[TMP31]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP33:%.*]] = lshr i64 [[TMP32]], 4
+; AARCH64-SCOPE-NEXT: [[TMP37:%.*]] = shl i64 [[TMP31]], 8
+; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP37]], 8
+; AARCH64-SCOPE-NEXT: [[TMP33:%.*]] = ashr i64 [[TMP35]], 4
; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP33]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP34]], i8 [[TMP30]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: ret i32 0
@@ -702,22 +735,25 @@ define dso_local i32 @multiple_lifetimes() local_unnamed_addr sanitize_hwaddress
; AARCH64-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP32:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP36:%.*]] = ashr i64 [[TMP32]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP36]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-NOSCOPE-NEXT: [[TMP30:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP31:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP32:%.*]] = and i64 [[TMP31]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP33:%.*]] = lshr i64 [[TMP32]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP37:%.*]] = shl i64 [[TMP31]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP37]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP33:%.*]] = ashr i64 [[TMP35]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP34:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP33]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP34]], i8 [[TMP30]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: ret i32 0
@@ -748,14 +784,16 @@ define dso_local i32 @multiple_lifetimes() local_unnamed_addr sanitize_hwaddress
; AARCH64-SHORT-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-SCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP34:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP34]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP38]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SHORT-SCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP29]], i32 0
; AARCH64-SHORT-SCOPE-NEXT: store i8 1, ptr [[TMP30]], align 1
@@ -765,8 +803,9 @@ define dso_local i32 @multiple_lifetimes() local_unnamed_addr sanitize_hwaddress
; AARCH64-SHORT-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-SCOPE-NEXT: [[TMP32:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP33:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP34:%.*]] = and i64 [[TMP33]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP35:%.*]] = lshr i64 [[TMP34]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP39:%.*]] = shl i64 [[TMP33]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = ashr i64 [[TMP39]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP37]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP35]]
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP36]], i8 [[TMP32]], i64 1, i1 false)
; AARCH64-SHORT-SCOPE-NEXT: ret i32 0
@@ -797,14 +836,16 @@ define dso_local i32 @multiple_lifetimes() local_unnamed_addr sanitize_hwaddress
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP34:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP38:%.*]] = ashr i64 [[TMP34]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP38]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP29]], i32 0
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 1, ptr [[TMP30]], align 1
@@ -814,8 +855,9 @@ define dso_local i32 @multiple_lifetimes() local_unnamed_addr sanitize_hwaddress
; AARCH64-SHORT-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP32:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP33:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP34:%.*]] = and i64 [[TMP33]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP35:%.*]] = lshr i64 [[TMP34]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP39:%.*]] = shl i64 [[TMP33]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP37:%.*]] = ashr i64 [[TMP39]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP37]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP36:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP35]]
; AARCH64-SHORT-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP36]], i8 [[TMP32]], i64 1, i1 false)
; AARCH64-SHORT-NOSCOPE-NEXT: ret i32 0
@@ -843,7 +885,8 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; X86-SCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-SCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-SCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-SCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-SCOPE-NEXT: [[TMP17:%.*]] = shl i64 [[TMP7]], 7
+; X86-SCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP17]], 7
; X86-SCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-SCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
@@ -852,12 +895,12 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP11]], i64 16)
; X86-SCOPE-NEXT: [[TMP12:%.*]] = tail call i1 (...) @cond()
; X86-SCOPE-NEXT: br i1 [[TMP12]], label [[TMP13:%.*]], label [[TMP15:%.*]]
-; X86-SCOPE: 13:
+; X86-SCOPE: 14:
; X86-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; X86-SCOPE-NEXT: [[TMP14:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP14]], i64 16)
; X86-SCOPE-NEXT: ret i32 0
-; X86-SCOPE: 15:
+; X86-SCOPE: 16:
; X86-SCOPE-NEXT: [[TMP16:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP16]], i64 16)
; X86-SCOPE-NEXT: ret i32 0
@@ -872,7 +915,8 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; X86-NOSCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-NOSCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-NOSCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-NOSCOPE-NEXT: [[TMP17:%.*]] = shl i64 [[TMP7]], 7
+; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP17]], 7
; X86-NOSCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-NOSCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
@@ -880,12 +924,12 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP11]], i64 16)
; X86-NOSCOPE-NEXT: [[TMP12:%.*]] = tail call i1 (...) @cond()
; X86-NOSCOPE-NEXT: br i1 [[TMP12]], label [[TMP13:%.*]], label [[TMP15:%.*]]
-; X86-NOSCOPE: 13:
+; X86-NOSCOPE: 14:
; X86-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; X86-NOSCOPE-NEXT: [[TMP14:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP14]], i64 16)
; X86-NOSCOPE-NEXT: ret i32 0
-; X86-NOSCOPE: 15:
+; X86-NOSCOPE: 16:
; X86-NOSCOPE-NEXT: [[TMP16:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP16]], i64 16)
; X86-NOSCOPE-NEXT: ret i32 0
@@ -916,33 +960,37 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP34]], 8
+; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-SCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: [[TMP30:%.*]] = tail call i1 (...) @cond()
; AARCH64-SCOPE-NEXT: br i1 [[TMP30]], label [[TMP31:%.*]], label [[TMP37:%.*]]
-; AARCH64-SCOPE: 31:
+; AARCH64-SCOPE: 33:
; AARCH64-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SCOPE-NEXT: [[TMP32:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SCOPE-NEXT: [[TMP33:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = and i64 [[TMP33]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = lshr i64 [[TMP34]], 4
+; AARCH64-SCOPE-NEXT: [[TMP45:%.*]] = shl i64 [[TMP33]], 8
+; AARCH64-SCOPE-NEXT: [[TMP46:%.*]] = ashr i64 [[TMP45]], 8
+; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP46]], 4
; AARCH64-SCOPE-NEXT: [[TMP36:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP35]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP36]], i8 [[TMP32]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: ret i32 0
-; AARCH64-SCOPE: 37:
+; AARCH64-SCOPE: 40:
; AARCH64-SCOPE-NEXT: [[TMP38:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SCOPE-NEXT: [[TMP39:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP40:%.*]] = and i64 [[TMP39]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP41:%.*]] = lshr i64 [[TMP40]], 4
+; AARCH64-SCOPE-NEXT: [[TMP43:%.*]] = shl i64 [[TMP39]], 8
+; AARCH64-SCOPE-NEXT: [[TMP44:%.*]] = ashr i64 [[TMP43]], 8
+; AARCH64-SCOPE-NEXT: [[TMP41:%.*]] = ashr i64 [[TMP44]], 4
; AARCH64-SCOPE-NEXT: [[TMP42:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP41]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP42]], i8 [[TMP38]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: ret i32 0
@@ -973,32 +1021,36 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; AARCH64-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP34:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP34]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: [[TMP30:%.*]] = tail call i1 (...) @cond()
; AARCH64-NOSCOPE-NEXT: br i1 [[TMP30]], label [[TMP31:%.*]], label [[TMP37:%.*]]
-; AARCH64-NOSCOPE: 31:
+; AARCH64-NOSCOPE: 33:
; AARCH64-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-NOSCOPE-NEXT: [[TMP32:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP33:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP34:%.*]] = and i64 [[TMP33]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP35:%.*]] = lshr i64 [[TMP34]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP45:%.*]] = shl i64 [[TMP33]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP46:%.*]] = ashr i64 [[TMP45]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP46]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP36:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP35]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP36]], i8 [[TMP32]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: ret i32 0
-; AARCH64-NOSCOPE: 37:
+; AARCH64-NOSCOPE: 40:
; AARCH64-NOSCOPE-NEXT: [[TMP38:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP39:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP40:%.*]] = and i64 [[TMP39]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP41:%.*]] = lshr i64 [[TMP40]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP43:%.*]] = shl i64 [[TMP39]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP44:%.*]] = ashr i64 [[TMP43]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP41:%.*]] = ashr i64 [[TMP44]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP42:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP41]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP42]], i8 [[TMP38]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: ret i32 0
@@ -1029,15 +1081,17 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SHORT-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SHORT-SCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP42:%.*]] = ashr i64 [[TMP36]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP42]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SHORT-SCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP29]], i32 0
; AARCH64-SHORT-SCOPE-NEXT: store i8 1, ptr [[TMP30]], align 1
@@ -1045,20 +1099,22 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SHORT-SCOPE-NEXT: store i8 [[TMP25]], ptr [[TMP31]], align 1
; AARCH64-SHORT-SCOPE-NEXT: [[TMP32:%.*]] = tail call i1 (...) @cond()
; AARCH64-SHORT-SCOPE-NEXT: br i1 [[TMP32]], label [[TMP33:%.*]], label [[TMP39:%.*]]
-; AARCH64-SHORT-SCOPE: 33:
+; AARCH64-SHORT-SCOPE: 35:
; AARCH64-SHORT-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-SCOPE-NEXT: [[TMP34:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP35:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = and i64 [[TMP35]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = lshr i64 [[TMP36]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP47:%.*]] = shl i64 [[TMP35]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP48:%.*]] = ashr i64 [[TMP47]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = ashr i64 [[TMP48]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP38:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP37]]
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP38]], i8 [[TMP34]], i64 1, i1 false)
; AARCH64-SHORT-SCOPE-NEXT: ret i32 0
-; AARCH64-SHORT-SCOPE: 39:
+; AARCH64-SHORT-SCOPE: 42:
; AARCH64-SHORT-SCOPE-NEXT: [[TMP40:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP41:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP42:%.*]] = and i64 [[TMP41]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP43:%.*]] = lshr i64 [[TMP42]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP45:%.*]] = shl i64 [[TMP41]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP46:%.*]] = ashr i64 [[TMP45]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP43:%.*]] = ashr i64 [[TMP46]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP44:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP43]]
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP44]], i8 [[TMP40]], i64 1, i1 false)
; AARCH64-SHORT-SCOPE-NEXT: ret i32 0
@@ -1089,14 +1145,16 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP36:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP42:%.*]] = ashr i64 [[TMP36]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP42]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP29]], i32 0
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 1, ptr [[TMP30]], align 1
@@ -1104,20 +1162,22 @@ define dso_local i32 @unreachable_exit() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 [[TMP25]], ptr [[TMP31]], align 1
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP32:%.*]] = tail call i1 (...) @cond()
; AARCH64-SHORT-NOSCOPE-NEXT: br i1 [[TMP32]], label [[TMP33:%.*]], label [[TMP39:%.*]]
-; AARCH64-SHORT-NOSCOPE: 33:
+; AARCH64-SHORT-NOSCOPE: 35:
; AARCH64-SHORT-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP34:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP35:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP36:%.*]] = and i64 [[TMP35]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP37:%.*]] = lshr i64 [[TMP36]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP47:%.*]] = shl i64 [[TMP35]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP48:%.*]] = ashr i64 [[TMP47]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP37:%.*]] = ashr i64 [[TMP48]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP38:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP37]]
; AARCH64-SHORT-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP38]], i8 [[TMP34]], i64 1, i1 false)
; AARCH64-SHORT-NOSCOPE-NEXT: ret i32 0
-; AARCH64-SHORT-NOSCOPE: 39:
+; AARCH64-SHORT-NOSCOPE: 42:
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP40:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP41:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP42:%.*]] = and i64 [[TMP41]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP43:%.*]] = lshr i64 [[TMP42]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP45:%.*]] = shl i64 [[TMP41]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP46:%.*]] = ashr i64 [[TMP45]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP43:%.*]] = ashr i64 [[TMP46]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP44:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP43]]
; AARCH64-SHORT-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP44]], i8 [[TMP40]], i64 1, i1 false)
; AARCH64-SHORT-NOSCOPE-NEXT: ret i32 0
@@ -1147,7 +1207,8 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; X86-SCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-SCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-SCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-SCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-SCOPE-NEXT: [[TMP18:%.*]] = shl i64 [[TMP7]], 7
+; X86-SCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP18]], 7
; X86-SCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-SCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
@@ -1156,18 +1217,18 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP11]], i64 16)
; X86-SCOPE-NEXT: [[TMP12:%.*]] = tail call i1 (...) @cond()
; X86-SCOPE-NEXT: br i1 [[TMP12]], label [[TMP13:%.*]], label [[TMP15:%.*]]
-; X86-SCOPE: 13:
+; X86-SCOPE: 14:
; X86-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; X86-SCOPE-NEXT: [[TMP14:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP14]], i64 16)
; X86-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP4]])
; X86-SCOPE-NEXT: br label [[TMP17:%.*]]
-; X86-SCOPE: 15:
+; X86-SCOPE: 16:
; X86-SCOPE-NEXT: [[TMP16:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-SCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP16]], i64 16)
; X86-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP4]])
; X86-SCOPE-NEXT: br label [[TMP17]]
-; X86-SCOPE: 17:
+; X86-SCOPE: 18:
; X86-SCOPE-NEXT: ret i32 0
;
; X86-NOSCOPE-LABEL: @diamond_lifetime(
@@ -1180,7 +1241,8 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; X86-NOSCOPE-NEXT: [[TMP5:%.*]] = call i8 @__hwasan_generate_tag()
; X86-NOSCOPE-NEXT: [[TMP6:%.*]] = zext i8 [[TMP5]] to i64
; X86-NOSCOPE-NEXT: [[TMP7:%.*]] = ptrtoint ptr [[TMP4]] to i64
-; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = and i64 [[TMP7]], -9079256848778919937
+; X86-NOSCOPE-NEXT: [[TMP17:%.*]] = shl i64 [[TMP7]], 7
+; X86-NOSCOPE-NEXT: [[TMP8:%.*]] = ashr i64 [[TMP17]], 7
; X86-NOSCOPE-NEXT: [[TMP9:%.*]] = shl i64 [[TMP6]], 57
; X86-NOSCOPE-NEXT: [[TMP10:%.*]] = or i64 [[TMP8]], [[TMP9]]
; X86-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP10]] to ptr
@@ -1188,12 +1250,12 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP11]], i64 16)
; X86-NOSCOPE-NEXT: [[TMP12:%.*]] = tail call i1 (...) @cond()
; X86-NOSCOPE-NEXT: br i1 [[TMP12]], label [[TMP13:%.*]], label [[TMP14:%.*]]
-; X86-NOSCOPE: 13:
+; X86-NOSCOPE: 14:
; X86-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; X86-NOSCOPE-NEXT: br label [[TMP15:%.*]]
-; X86-NOSCOPE: 14:
-; X86-NOSCOPE-NEXT: br label [[TMP15]]
; X86-NOSCOPE: 15:
+; X86-NOSCOPE-NEXT: br label [[TMP15]]
+; X86-NOSCOPE: 16:
; X86-NOSCOPE-NEXT: [[TMP16:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; X86-NOSCOPE-NEXT: call void @__hwasan_tag_memory(ptr [[TMP4]], i8 [[TMP16]], i64 16)
; X86-NOSCOPE-NEXT: ret i32 0
@@ -1224,39 +1286,43 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP34]], 8
+; AARCH64-SCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-SCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: [[TMP30:%.*]] = tail call i1 (...) @cond()
; AARCH64-SCOPE-NEXT: br i1 [[TMP30]], label [[TMP31:%.*]], label [[TMP37:%.*]]
-; AARCH64-SCOPE: 31:
+; AARCH64-SCOPE: 33:
; AARCH64-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SCOPE-NEXT: [[TMP32:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SCOPE-NEXT: [[TMP33:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP34:%.*]] = and i64 [[TMP33]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = lshr i64 [[TMP34]], 4
+; AARCH64-SCOPE-NEXT: [[TMP45:%.*]] = shl i64 [[TMP33]], 8
+; AARCH64-SCOPE-NEXT: [[TMP46:%.*]] = ashr i64 [[TMP45]], 8
+; AARCH64-SCOPE-NEXT: [[TMP35:%.*]] = ashr i64 [[TMP46]], 4
; AARCH64-SCOPE-NEXT: [[TMP36:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP35]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP36]], i8 [[TMP32]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SCOPE-NEXT: br label [[TMP43:%.*]]
-; AARCH64-SCOPE: 37:
+; AARCH64-SCOPE: 40:
; AARCH64-SCOPE-NEXT: [[TMP38:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SCOPE-NEXT: [[TMP39:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SCOPE-NEXT: [[TMP40:%.*]] = and i64 [[TMP39]], 72057594037927935
-; AARCH64-SCOPE-NEXT: [[TMP41:%.*]] = lshr i64 [[TMP40]], 4
+; AARCH64-SCOPE-NEXT: [[TMP47:%.*]] = shl i64 [[TMP39]], 8
+; AARCH64-SCOPE-NEXT: [[TMP44:%.*]] = ashr i64 [[TMP47]], 8
+; AARCH64-SCOPE-NEXT: [[TMP41:%.*]] = ashr i64 [[TMP44]], 4
; AARCH64-SCOPE-NEXT: [[TMP42:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP41]]
; AARCH64-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP42]], i8 [[TMP38]], i64 1, i1 false)
; AARCH64-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SCOPE-NEXT: br label [[TMP43]]
-; AARCH64-SCOPE: 43:
+; AARCH64-SCOPE: 47:
; AARCH64-SCOPE-NEXT: ret i32 0
;
; AARCH64-NOSCOPE-LABEL: @diamond_lifetime(
@@ -1285,28 +1351,31 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; AARCH64-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP36:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP40:%.*]] = ashr i64 [[TMP36]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP40]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP29]], i8 [[TMP25]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: [[TMP30:%.*]] = tail call i1 (...) @cond()
; AARCH64-NOSCOPE-NEXT: br i1 [[TMP30]], label [[TMP31:%.*]], label [[TMP32:%.*]]
-; AARCH64-NOSCOPE: 31:
+; AARCH64-NOSCOPE: 33:
; AARCH64-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-NOSCOPE-NEXT: br label [[TMP33:%.*]]
-; AARCH64-NOSCOPE: 32:
+; AARCH64-NOSCOPE: 34:
; AARCH64-NOSCOPE-NEXT: br label [[TMP33]]
-; AARCH64-NOSCOPE: 33:
+; AARCH64-NOSCOPE: 35:
; AARCH64-NOSCOPE-NEXT: [[TMP34:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-NOSCOPE-NEXT: [[TMP35:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-NOSCOPE-NEXT: [[TMP36:%.*]] = and i64 [[TMP35]], 72057594037927935
-; AARCH64-NOSCOPE-NEXT: [[TMP37:%.*]] = lshr i64 [[TMP36]], 4
+; AARCH64-NOSCOPE-NEXT: [[TMP41:%.*]] = shl i64 [[TMP35]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP39:%.*]] = ashr i64 [[TMP41]], 8
+; AARCH64-NOSCOPE-NEXT: [[TMP37:%.*]] = ashr i64 [[TMP39]], 4
; AARCH64-NOSCOPE-NEXT: [[TMP38:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP37]]
; AARCH64-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP38]], i8 [[TMP34]], i64 1, i1 false)
; AARCH64-NOSCOPE-NEXT: ret i32 0
@@ -1337,15 +1406,17 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SHORT-SCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-SCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-SCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-SCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-SCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.lifetime.start.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SHORT-SCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP42:%.*]] = ashr i64 [[TMP36]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP42]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SHORT-SCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP29]], i32 0
; AARCH64-SHORT-SCOPE-NEXT: store i8 1, ptr [[TMP30]], align 1
@@ -1353,26 +1424,28 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SHORT-SCOPE-NEXT: store i8 [[TMP25]], ptr [[TMP31]], align 1
; AARCH64-SHORT-SCOPE-NEXT: [[TMP32:%.*]] = tail call i1 (...) @cond()
; AARCH64-SHORT-SCOPE-NEXT: br i1 [[TMP32]], label [[TMP33:%.*]], label [[TMP39:%.*]]
-; AARCH64-SHORT-SCOPE: 33:
+; AARCH64-SHORT-SCOPE: 35:
; AARCH64-SHORT-SCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-SCOPE-NEXT: [[TMP34:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP35:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP36:%.*]] = and i64 [[TMP35]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = lshr i64 [[TMP36]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP47:%.*]] = shl i64 [[TMP35]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP48:%.*]] = ashr i64 [[TMP47]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP37:%.*]] = ashr i64 [[TMP48]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP38:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP37]]
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP38]], i8 [[TMP34]], i64 1, i1 false)
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SHORT-SCOPE-NEXT: br label [[TMP45:%.*]]
-; AARCH64-SHORT-SCOPE: 39:
+; AARCH64-SHORT-SCOPE: 42:
; AARCH64-SHORT-SCOPE-NEXT: [[TMP40:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-SCOPE-NEXT: [[TMP41:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP42:%.*]] = and i64 [[TMP41]], 72057594037927935
-; AARCH64-SHORT-SCOPE-NEXT: [[TMP43:%.*]] = lshr i64 [[TMP42]], 4
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP49:%.*]] = shl i64 [[TMP41]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP46:%.*]] = ashr i64 [[TMP49]], 8
+; AARCH64-SHORT-SCOPE-NEXT: [[TMP43:%.*]] = ashr i64 [[TMP46]], 4
; AARCH64-SHORT-SCOPE-NEXT: [[TMP44:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP43]]
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP44]], i8 [[TMP40]], i64 1, i1 false)
; AARCH64-SHORT-SCOPE-NEXT: call void @llvm.lifetime.end.p0(i64 16, ptr nonnull [[TMP18]])
; AARCH64-SHORT-SCOPE-NEXT: br label [[TMP45]]
-; AARCH64-SHORT-SCOPE: 45:
+; AARCH64-SHORT-SCOPE: 49:
; AARCH64-SHORT-SCOPE-NEXT: ret i32 0
;
; AARCH64-SHORT-NOSCOPE-LABEL: @diamond_lifetime(
@@ -1401,14 +1474,16 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP19:%.*]] = call i8 @__hwasan_generate_tag()
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP20:%.*]] = zext i8 [[TMP19]] to i64
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP21:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = and i64 [[TMP21]], 72057594037927935
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = shl i64 [[TMP21]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP22:%.*]] = ashr i64 [[TMP27]], 8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP23:%.*]] = shl i64 [[TMP20]], 56
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP24:%.*]] = or i64 [[TMP22]], [[TMP23]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[ALLOCA_0_HWASAN:%.*]] = inttoptr i64 [[TMP24]] to ptr
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP25:%.*]] = trunc i64 [[TMP20]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP26:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP27:%.*]] = and i64 [[TMP26]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = lshr i64 [[TMP27]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP38:%.*]] = shl i64 [[TMP26]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP42:%.*]] = ashr i64 [[TMP38]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP28:%.*]] = ashr i64 [[TMP42]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP29:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP28]]
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP30:%.*]] = getelementptr i8, ptr [[TMP29]], i32 0
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 1, ptr [[TMP30]], align 1
@@ -1416,16 +1491,17 @@ define dso_local i32 @diamond_lifetime() local_unnamed_addr sanitize_hwaddress {
; AARCH64-SHORT-NOSCOPE-NEXT: store i8 [[TMP25]], ptr [[TMP31]], align 1
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP32:%.*]] = tail call i1 (...) @cond()
; AARCH64-SHORT-NOSCOPE-NEXT: br i1 [[TMP32]], label [[TMP33:%.*]], label [[TMP34:%.*]]
-; AARCH64-SHORT-NOSCOPE: 33:
+; AARCH64-SHORT-NOSCOPE: 35:
; AARCH64-SHORT-NOSCOPE-NEXT: call void @use(ptr nonnull [[ALLOCA_0_HWASAN]])
; AARCH64-SHORT-NOSCOPE-NEXT: br label [[TMP35:%.*]]
-; AARCH64-SHORT-NOSCOPE: 34:
+; AARCH64-SHORT-NOSCOPE: 36:
; AARCH64-SHORT-NOSCOPE-NEXT: br label [[TMP35]]
-; AARCH64-SHORT-NOSCOPE: 35:
+; AARCH64-SHORT-NOSCOPE: 37:
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP36:%.*]] = trunc i64 [[HWASAN_UAR_TAG]] to i8
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP37:%.*]] = ptrtoint ptr [[TMP18]] to i64
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP38:%.*]] = and i64 [[TMP37]], 72057594037927935
-; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP39:%.*]] = lshr i64 [[TMP38]], 4
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP43:%.*]] = shl i64 [[TMP37]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP41:%.*]] = ashr i64 [[TMP43]], 8
+; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP39:%.*]] = ashr i64 [[TMP41]], 4
; AARCH64-SHORT-NOSCOPE-NEXT: [[TMP40:%.*]] = getelementptr i8, ptr [[TMP17]], i64 [[TMP39]]
; AARCH64-SHORT-NOSCOPE-NEXT: call void @llvm.memset.p0.i64(ptr align 1 [[TMP40]], i8 [[TMP36]], i64 1, i1 false)
; AARCH64-SHORT-NOSCOPE-NEXT: ret i32 0
More information about the llvm-commits
mailing list