This is an archive of the discontinued LLVM Phabricator instance.

Differential D42138

[hwasan] Rename sized load/store callbacks to be consistent with ASan.
ClosedPublic

Authored by eugenis on Jan 16 2018, 3:14 PM.

Details

Reviewers
kcc
Commits
rGc07e0bd5336d: [hwasan] Rename sized load/store callbacks to be consistent with ASan.
rL322601: [hwasan] Rename sized load/store callbacks to be consistent with ASan.
Summary

hwasan_load is now hwasan_loadN.

Diff Detail

Repository
rL LLVM

Event Timeline

eugenis created this revision.Jan 16 2018, 3:14 PM
Herald added a subscriber: hiraditya. · View Herald TranscriptJan 16 2018, 3:14 PM
kcc accepted this revision.Jan 16 2018, 3:15 PM

LGTM

This revision is now accepted and ready to land.Jan 16 2018, 3:15 PM
Closed by commit rL322601: [hwasan] Rename sized load/store callbacks to be consistent with ASan. (authored by eugenis). · Explain WhyJan 16 2018, 3:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Transforms/
Instrumentation/
2 lines
test/
Instrumentation/
HWAddressSanitizer/
12 lines
8 lines

Diff 130048

llvm/trunk/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp

Show First 20 Lines • Show All 188 Lines • ▼ Show 20 Lines
void HWAddressSanitizer::initializeCallbacks(Module &M) { void HWAddressSanitizer::initializeCallbacks(Module &M) {
IRBuilder<> IRB(*C); IRBuilder<> IRB(*C);
for (size_t AccessIsWrite = 0; AccessIsWrite <= 1; AccessIsWrite++) { for (size_t AccessIsWrite = 0; AccessIsWrite <= 1; AccessIsWrite++) {
const std::string TypeStr = AccessIsWrite ? "store" : "load"; const std::string TypeStr = AccessIsWrite ? "store" : "load";
const std::string EndingStr = Recover ? "_noabort" : ""; const std::string EndingStr = Recover ? "_noabort" : "";
HwasanMemoryAccessCallbackSized[AccessIsWrite] = HwasanMemoryAccessCallbackSized[AccessIsWrite] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction( checkSanitizerInterfaceFunction(M.getOrInsertFunction(
ClMemoryAccessCallbackPrefix + TypeStr + EndingStr, ClMemoryAccessCallbackPrefix + TypeStr + "N" + EndingStr,
FunctionType::get(IRB.getVoidTy(), {IntptrTy, IntptrTy}, false))); FunctionType::get(IRB.getVoidTy(), {IntptrTy, IntptrTy}, false)));
for (size_t AccessSizeIndex = 0; AccessSizeIndex < kNumberOfAccessSizes; for (size_t AccessSizeIndex = 0; AccessSizeIndex < kNumberOfAccessSizes;
AccessSizeIndex++) { AccessSizeIndex++) {
HwasanMemoryAccessCallback[AccessIsWrite][AccessSizeIndex] = HwasanMemoryAccessCallback[AccessIsWrite][AccessSizeIndex] =
checkSanitizerInterfaceFunction(M.getOrInsertFunction( checkSanitizerInterfaceFunction(M.getOrInsertFunction(
ClMemoryAccessCallbackPrefix + TypeStr + ClMemoryAccessCallbackPrefix + TypeStr +
itostr(1ULL << AccessSizeIndex) + EndingStr, itostr(1ULL << AccessSizeIndex) + EndingStr,
▲ Show 20 Lines • Show All 336 Lines • Show Last 20 Lines

llvm/trunk/test/Instrumentation/HWAddressSanitizer/basic.ll

Show First 20 Lines • Show All 128 Lines • ▼ Show 20 Lines
entry: entry:
%b = load i128, i128* %a, align 16 %b = load i128, i128* %a, align 16
ret i128 %b ret i128 %b
} }
define i40 @test_load40(i40* %a) sanitize_hwaddress { define i40 @test_load40(i40* %a) sanitize_hwaddress {
; CHECK-LABEL: @test_load40( ; CHECK-LABEL: @test_load40(
; CHECK: %[[A:[^ ]*]] = ptrtoint i40* %a to i64 ; CHECK: %[[A:[^ ]*]] = ptrtoint i40* %a to i64
; ABORT: call void @__hwasan_load(i64 %[[A]], i64 5) ; ABORT: call void @__hwasan_loadN(i64 %[[A]], i64 5)
; RECOVER: call void @__hwasan_load_noabort(i64 %[[A]], i64 5) ; RECOVER: call void @__hwasan_loadN_noabort(i64 %[[A]], i64 5)
; CHECK: %[[B:[^ ]*]] = load i40, i40* %a ; CHECK: %[[B:[^ ]*]] = load i40, i40* %a
; CHECK: ret i40 %[[B]] ; CHECK: ret i40 %[[B]]
entry: entry:
%b = load i40, i40* %a, align 4 %b = load i40, i40* %a, align 4
ret i40 %b ret i40 %b
} }
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Lines
entry: entry:
store i128 %b, i128* %a, align 16 store i128 %b, i128* %a, align 16
ret void ret void
} }
define void @test_store40(i40* %a, i40 %b) sanitize_hwaddress { define void @test_store40(i40* %a, i40 %b) sanitize_hwaddress {
; CHECK-LABEL: @test_store40( ; CHECK-LABEL: @test_store40(
; CHECK: %[[A:[^ ]*]] = ptrtoint i40* %a to i64 ; CHECK: %[[A:[^ ]*]] = ptrtoint i40* %a to i64
; ABORT: call void @__hwasan_store(i64 %[[A]], i64 5) ; ABORT: call void @__hwasan_storeN(i64 %[[A]], i64 5)
; RECOVER: call void @__hwasan_store_noabort(i64 %[[A]], i64 5) ; RECOVER: call void @__hwasan_storeN_noabort(i64 %[[A]], i64 5)
; CHECK: store i40 %b, i40* %a ; CHECK: store i40 %b, i40* %a
; CHECK: ret void ; CHECK: ret void
entry: entry:
store i40 %b, i40* %a, align 4 store i40 %b, i40* %a, align 4
ret void ret void
} }
define void @test_store_unaligned(i64* %a, i64 %b) sanitize_hwaddress { define void @test_store_unaligned(i64* %a, i64 %b) sanitize_hwaddress {
; CHECK-LABEL: @test_store_unaligned( ; CHECK-LABEL: @test_store_unaligned(
; CHECK: %[[A:[^ ]*]] = ptrtoint i64* %a to i64 ; CHECK: %[[A:[^ ]*]] = ptrtoint i64* %a to i64
; ABORT: call void @__hwasan_store(i64 %[[A]], i64 8) ; ABORT: call void @__hwasan_storeN(i64 %[[A]], i64 8)
; RECOVER: call void @__hwasan_store_noabort(i64 %[[A]], i64 8) ; RECOVER: call void @__hwasan_storeN_noabort(i64 %[[A]], i64 8)
; CHECK: store i64 %b, i64* %a, align 4 ; CHECK: store i64 %b, i64* %a, align 4
; CHECK: ret void ; CHECK: ret void
entry: entry:
store i64 %b, i64* %a, align 4 store i64 %b, i64* %a, align 4
ret void ret void
} }
Show All 39 Lines

llvm/trunk/test/Instrumentation/HWAddressSanitizer/with-calls.ll

Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Lines
entry: entry:
%b = load i128, i128* %a, align 16 %b = load i128, i128* %a, align 16
ret i128 %b ret i128 %b
} }
define i40 @test_load40(i40* %a) sanitize_hwaddress { define i40 @test_load40(i40* %a) sanitize_hwaddress {
; CHECK-LABEL: @test_load40( ; CHECK-LABEL: @test_load40(
; CHECK: %[[A:[^ ]*]] = ptrtoint i40* %a to i64 ; CHECK: %[[A:[^ ]*]] = ptrtoint i40* %a to i64
; ABORT: call void @__hwasan_load(i64 %[[A]], i64 5) ; ABORT: call void @__hwasan_loadN(i64 %[[A]], i64 5)
; RECOVER: call void @__hwasan_load_noabort(i64 %[[A]], i64 5) ; RECOVER: call void @__hwasan_loadN_noabort(i64 %[[A]], i64 5)
; CHECK: %[[B:[^ ]*]] = load i40, i40* %a ; CHECK: %[[B:[^ ]*]] = load i40, i40* %a
; CHECK: ret i40 %[[B]] ; CHECK: ret i40 %[[B]]
entry: entry:
%b = load i40, i40* %a, align 4 %b = load i40, i40* %a, align 4
ret i40 %b ret i40 %b
} }
▲ Show 20 Lines • Show All 60 Lines • ▼ Show 20 Lines
entry: entry:
store i128 %b, i128* %a, align 16 store i128 %b, i128* %a, align 16
ret void ret void
} }
define void @test_store40(i40* %a, i40 %b) sanitize_hwaddress { define void @test_store40(i40* %a, i40 %b) sanitize_hwaddress {
; CHECK-LABEL: @test_store40( ; CHECK-LABEL: @test_store40(
; CHECK: %[[A:[^ ]*]] = ptrtoint i40* %a to i64 ; CHECK: %[[A:[^ ]*]] = ptrtoint i40* %a to i64
; ABORT: call void @__hwasan_store(i64 %[[A]], i64 5) ; ABORT: call void @__hwasan_storeN(i64 %[[A]], i64 5)
; RECOVER: call void @__hwasan_store_noabort(i64 %[[A]], i64 5) ; RECOVER: call void @__hwasan_storeN_noabort(i64 %[[A]], i64 5)
; CHECK: store i40 %b, i40* %a ; CHECK: store i40 %b, i40* %a
; CHECK: ret void ; CHECK: ret void
entry: entry:
store i40 %b, i40* %a, align 4 store i40 %b, i40* %a, align 4
ret void ret void
} }
Show All 39 Lines