[llvm] [NFC][HWASAN] Promote InstrumentGlobals to member (PR #86773)
Vitaly Buka via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 27 10:37:44 PDT 2024
https://github.com/vitalybuka updated https://github.com/llvm/llvm-project/pull/86773
>From 3d80151d904bb85109c8f3fa48a918ea7c470cf7 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Tue, 26 Mar 2024 23:00:21 -0700
Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?=
=?UTF-8?q?anges=20to=20main=20this=20commit=20is=20based=20on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Created using spr 1.3.4
[skip ci]
---
llvm/include/llvm/IR/GlobalValue.h | 1 +
llvm/include/llvm/IR/IRBuilder.h | 6 ++
llvm/lib/IR/Globals.cpp | 7 +++
.../HWAddressSanitizer/globals-access.ll | 60 +++++++++++++++++++
4 files changed, 74 insertions(+)
create mode 100644 llvm/test/Instrumentation/HWAddressSanitizer/globals-access.ll
diff --git a/llvm/include/llvm/IR/GlobalValue.h b/llvm/include/llvm/IR/GlobalValue.h
index aa8188cd99fee1..c61d502aa332b0 100644
--- a/llvm/include/llvm/IR/GlobalValue.h
+++ b/llvm/include/llvm/IR/GlobalValue.h
@@ -360,6 +360,7 @@ class GlobalValue : public Constant {
// storage is shared between `G1` and `G2`.
void setSanitizerMetadata(SanitizerMetadata Meta);
void removeSanitizerMetadata();
+ void setNoSanitizeMetadata();
bool isTagged() const {
return hasSanitizerMetadata() && getSanitizerMetadata().Memtag;
diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h
index a6165ef13fd790..2a0c1e9e8c446b 100644
--- a/llvm/include/llvm/IR/IRBuilder.h
+++ b/llvm/include/llvm/IR/IRBuilder.h
@@ -221,6 +221,12 @@ class IRBuilderBase {
AddOrRemoveMetadataToCopy(LLVMContext::MD_dbg, L.getAsMDNode());
}
+ /// Set nosanitize metadata.
+ void SetNoSanitizeMetadata() {
+ AddOrRemoveMetadataToCopy(llvm::LLVMContext::MD_nosanitize,
+ llvm::MDNode::get(getContext(), std::nullopt));
+ }
+
/// Collect metadata with IDs \p MetadataKinds from \p Src which should be
/// added to all created instructions. Entries present in MedataDataToCopy but
/// not on \p Src will be dropped from MetadataToCopy.
diff --git a/llvm/lib/IR/Globals.cpp b/llvm/lib/IR/Globals.cpp
index 481a1d802e66b6..40f854a2c90635 100644
--- a/llvm/lib/IR/Globals.cpp
+++ b/llvm/lib/IR/Globals.cpp
@@ -243,6 +243,13 @@ void GlobalValue::removeSanitizerMetadata() {
HasSanitizerMetadata = false;
}
+void GlobalValue::setNoSanitizeMetadata() {
+ SanitizerMetadata Meta;
+ Meta.NoAddress = true;
+ Meta.NoHWAddress = true;
+ setSanitizerMetadata(Meta);
+}
+
StringRef GlobalObject::getSectionImpl() const {
assert(hasSection());
return getContext().pImpl->GlobalObjectSections[this];
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/globals-access.ll b/llvm/test/Instrumentation/HWAddressSanitizer/globals-access.ll
new file mode 100644
index 00000000000000..e59701253d8bc1
--- /dev/null
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/globals-access.ll
@@ -0,0 +1,60 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals all --global-value-regex "x" --version 4
+; RUN: opt < %s -S -passes=hwasan -mtriple=aarch64 -hwasan-globals=0 | FileCheck --check-prefixes=OFF %s
+; RUN: opt < %s -S -passes=hwasan -mtriple=aarch64 -hwasan-globals=1 | FileCheck --check-prefixes=CHECK %s
+
+ at x = dso_local global i32 0, align 4
+
+;.
+; OFF: @x = dso_local global i32 0, align 4
+;.
+; CHECK: @x = alias i32, inttoptr (i64 add (i64 ptrtoint (ptr @x.hwasan to i64), i64 5260204364768739328) to ptr)
+;.
+define dso_local noundef i32 @_Z3tmpv() sanitize_hwaddress {
+; OFF-LABEL: define dso_local noundef i32 @_Z3tmpv(
+; OFF-SAME: ) #[[ATTR0:[0-9]+]] {
+; OFF-NEXT: entry:
+; OFF-NEXT: [[TMP12:%.*]] = load i64, ptr @__hwasan_tls, align 8
+; OFF-NEXT: [[TMP1:%.*]] = or i64 [[TMP12]], 4294967295
+; OFF-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP1]], 1
+; OFF-NEXT: [[TMP2:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
+; OFF-NEXT: [[TMP3:%.*]] = lshr i64 ptrtoint (ptr @x to i64), 56
+; OFF-NEXT: [[TMP4:%.*]] = trunc i64 [[TMP3]] to i8
+; OFF-NEXT: [[TMP5:%.*]] = and i64 ptrtoint (ptr @x to i64), 72057594037927935
+; OFF-NEXT: [[TMP6:%.*]] = lshr i64 [[TMP5]], 4
+; OFF-NEXT: [[TMP7:%.*]] = getelementptr i8, ptr [[TMP2]], i64 [[TMP6]]
+; OFF-NEXT: [[TMP8:%.*]] = load i8, ptr [[TMP7]], align 1
+; OFF-NEXT: [[TMP9:%.*]] = icmp ne i8 [[TMP4]], [[TMP8]]
+; OFF-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1:![0-9]+]]
+; OFF: 10:
+; OFF-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP2]], ptr @x, i32 2)
+; OFF-NEXT: br label [[TMP11]]
+; OFF: 11:
+; OFF-NEXT: [[TMP0:%.*]] = load i32, ptr @x, align 4
+; OFF-NEXT: ret i32 [[TMP0]]
+;
+; CHECK-LABEL: define dso_local noundef i32 @_Z3tmpv(
+; CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[TMP12:%.*]] = load i64, ptr @__hwasan_tls, align 8
+; CHECK-NEXT: [[TMP1:%.*]] = or i64 [[TMP12]], 4294967295
+; CHECK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP1]], 1
+; CHECK-NEXT: [[TMP2:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
+; CHECK-NEXT: [[TMP3:%.*]] = lshr i64 ptrtoint (ptr @x to i64), 56
+; CHECK-NEXT: [[TMP4:%.*]] = trunc i64 [[TMP3]] to i8
+; CHECK-NEXT: [[TMP5:%.*]] = and i64 ptrtoint (ptr @x to i64), 72057594037927935
+; CHECK-NEXT: [[TMP6:%.*]] = lshr i64 [[TMP5]], 4
+; CHECK-NEXT: [[TMP7:%.*]] = getelementptr i8, ptr [[TMP2]], i64 [[TMP6]]
+; CHECK-NEXT: [[TMP8:%.*]] = load i8, ptr [[TMP7]], align 1
+; CHECK-NEXT: [[TMP9:%.*]] = icmp ne i8 [[TMP4]], [[TMP8]]
+; CHECK-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF2:![0-9]+]]
+; CHECK: 10:
+; CHECK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP2]], ptr @x, i32 2)
+; CHECK-NEXT: br label [[TMP11]]
+; CHECK: 11:
+; CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr @x, align 4
+; CHECK-NEXT: ret i32 [[TMP0]]
+;
+entry:
+ %0 = load i32, ptr @x, align 4
+ ret i32 %0
+}
>From d8bdb8cc4aab7cfbd4634cd906f7d0efb3f6e82e Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Tue, 26 Mar 2024 23:18:27 -0700
Subject: [PATCH 2/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20ch?=
=?UTF-8?q?anges=20introduced=20through=20rebase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Created using spr 1.3.4
[skip ci]
---
.../HWAddressSanitizer/globals-access.ll | 48 +++++++++----------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/llvm/test/Instrumentation/HWAddressSanitizer/globals-access.ll b/llvm/test/Instrumentation/HWAddressSanitizer/globals-access.ll
index e59701253d8bc1..8c24de7229815f 100644
--- a/llvm/test/Instrumentation/HWAddressSanitizer/globals-access.ll
+++ b/llvm/test/Instrumentation/HWAddressSanitizer/globals-access.ll
@@ -1,36 +1,36 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals all --global-value-regex "x" --version 4
-; RUN: opt < %s -S -passes=hwasan -mtriple=aarch64 -hwasan-globals=0 | FileCheck --check-prefixes=OFF %s
-; RUN: opt < %s -S -passes=hwasan -mtriple=aarch64 -hwasan-globals=1 | FileCheck --check-prefixes=CHECK %s
+; RUN: opt < %s -S -passes=hwasan -mtriple=aarch64 -hwasan-globals=0 | FileCheck %s --check-prefixes=NOSTACK
+; RUN: opt < %s -S -passes=hwasan -mtriple=aarch64 -hwasan-globals=1 | FileCheck %s
@x = dso_local global i32 0, align 4
;.
-; OFF: @x = dso_local global i32 0, align 4
+; NOSTACK: @x = dso_local global i32 0, align 4
;.
; CHECK: @x = alias i32, inttoptr (i64 add (i64 ptrtoint (ptr @x.hwasan to i64), i64 5260204364768739328) to ptr)
;.
define dso_local noundef i32 @_Z3tmpv() sanitize_hwaddress {
-; OFF-LABEL: define dso_local noundef i32 @_Z3tmpv(
-; OFF-SAME: ) #[[ATTR0:[0-9]+]] {
-; OFF-NEXT: entry:
-; OFF-NEXT: [[TMP12:%.*]] = load i64, ptr @__hwasan_tls, align 8
-; OFF-NEXT: [[TMP1:%.*]] = or i64 [[TMP12]], 4294967295
-; OFF-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP1]], 1
-; OFF-NEXT: [[TMP2:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
-; OFF-NEXT: [[TMP3:%.*]] = lshr i64 ptrtoint (ptr @x to i64), 56
-; OFF-NEXT: [[TMP4:%.*]] = trunc i64 [[TMP3]] to i8
-; OFF-NEXT: [[TMP5:%.*]] = and i64 ptrtoint (ptr @x to i64), 72057594037927935
-; OFF-NEXT: [[TMP6:%.*]] = lshr i64 [[TMP5]], 4
-; OFF-NEXT: [[TMP7:%.*]] = getelementptr i8, ptr [[TMP2]], i64 [[TMP6]]
-; OFF-NEXT: [[TMP8:%.*]] = load i8, ptr [[TMP7]], align 1
-; OFF-NEXT: [[TMP9:%.*]] = icmp ne i8 [[TMP4]], [[TMP8]]
-; OFF-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1:![0-9]+]]
-; OFF: 10:
-; OFF-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP2]], ptr @x, i32 2)
-; OFF-NEXT: br label [[TMP11]]
-; OFF: 11:
-; OFF-NEXT: [[TMP0:%.*]] = load i32, ptr @x, align 4
-; OFF-NEXT: ret i32 [[TMP0]]
+; NOSTACK-LABEL: define dso_local noundef i32 @_Z3tmpv(
+; NOSTACK-SAME: ) #[[ATTR0:[0-9]+]] {
+; NOSTACK-NEXT: entry:
+; NOSTACK-NEXT: [[TMP12:%.*]] = load i64, ptr @__hwasan_tls, align 8
+; NOSTACK-NEXT: [[TMP1:%.*]] = or i64 [[TMP12]], 4294967295
+; NOSTACK-NEXT: [[HWASAN_SHADOW:%.*]] = add i64 [[TMP1]], 1
+; NOSTACK-NEXT: [[TMP2:%.*]] = inttoptr i64 [[HWASAN_SHADOW]] to ptr
+; NOSTACK-NEXT: [[TMP3:%.*]] = lshr i64 ptrtoint (ptr @x to i64), 56
+; NOSTACK-NEXT: [[TMP4:%.*]] = trunc i64 [[TMP3]] to i8
+; NOSTACK-NEXT: [[TMP5:%.*]] = and i64 ptrtoint (ptr @x to i64), 72057594037927935
+; NOSTACK-NEXT: [[TMP6:%.*]] = lshr i64 [[TMP5]], 4
+; NOSTACK-NEXT: [[TMP7:%.*]] = getelementptr i8, ptr [[TMP2]], i64 [[TMP6]]
+; NOSTACK-NEXT: [[TMP8:%.*]] = load i8, ptr [[TMP7]], align 1
+; NOSTACK-NEXT: [[TMP9:%.*]] = icmp ne i8 [[TMP4]], [[TMP8]]
+; NOSTACK-NEXT: br i1 [[TMP9]], label [[TMP10:%.*]], label [[TMP11:%.*]], !prof [[PROF1:![0-9]+]]
+; NOSTACK: 10:
+; NOSTACK-NEXT: call void @llvm.hwasan.check.memaccess.shortgranules(ptr [[TMP2]], ptr @x, i32 2)
+; NOSTACK-NEXT: br label [[TMP11]]
+; NOSTACK: 11:
+; NOSTACK-NEXT: [[TMP0:%.*]] = load i32, ptr @x, align 4
+; NOSTACK-NEXT: ret i32 [[TMP0]]
;
; CHECK-LABEL: define dso_local noundef i32 @_Z3tmpv(
; CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
More information about the llvm-commits
mailing list