[dfsan] Correctly handle loads and stores of zero size.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214561 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Collingbourne 2014-08-01 21:18:18 +00:00
parent f9799dbe51
commit f1499548d0
3 changed files with 34 additions and 1 deletions

View File

@ -1092,6 +1092,11 @@ Value *DFSanFunction::loadShadow(Value *Addr, uint64_t Size, uint64_t Align,
void DFSanVisitor::visitLoadInst(LoadInst &LI) { void DFSanVisitor::visitLoadInst(LoadInst &LI) {
uint64_t Size = DFSF.DFS.DL->getTypeStoreSize(LI.getType()); uint64_t Size = DFSF.DFS.DL->getTypeStoreSize(LI.getType());
if (Size == 0) {
DFSF.setShadow(&LI, DFSF.DFS.ZeroShadow);
return;
}
uint64_t Align; uint64_t Align;
if (ClPreserveAlignment) { if (ClPreserveAlignment) {
Align = LI.getAlignment(); Align = LI.getAlignment();
@ -1166,6 +1171,9 @@ void DFSanFunction::storeShadow(Value *Addr, uint64_t Size, uint64_t Align,
void DFSanVisitor::visitStoreInst(StoreInst &SI) { void DFSanVisitor::visitStoreInst(StoreInst &SI) {
uint64_t Size = uint64_t Size =
DFSF.DFS.DL->getTypeStoreSize(SI.getValueOperand()->getType()); DFSF.DFS.DL->getTypeStoreSize(SI.getValueOperand()->getType());
if (Size == 0)
return;
uint64_t Align; uint64_t Align;
if (ClPreserveAlignment) { if (ClPreserveAlignment) {
Align = SI.getAlignment(); Align = SI.getAlignment();

View File

@ -2,6 +2,18 @@
; RUN: opt < %s -dfsan -dfsan-combine-pointer-labels-on-load=0 -S | FileCheck %s --check-prefix=NO_COMBINE_PTR_LABEL ; RUN: opt < %s -dfsan -dfsan-combine-pointer-labels-on-load=0 -S | FileCheck %s --check-prefix=NO_COMBINE_PTR_LABEL
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
define {} @load0({}* %p) {
; COMBINE_PTR_LABEL: @"dfs$load0"
; COMBINE_PTR_LABEL: load
; COMBINE_PTR_LABEL-NOT: load
; NO_COMBINE_PTR_LABEL: @"dfs$load0"
; NO_COMBINE_PTR_LABEL: load
; NO_COMBINE_PTR_LABEL-NOT: load
%a = load {}* %p
ret {} %a
}
define i8 @load8(i8* %p) { define i8 @load8(i8* %p) {
; COMBINE_PTR_LABEL: @"dfs$load8" ; COMBINE_PTR_LABEL: @"dfs$load8"
; COMBINE_PTR_LABEL: load i16* ; COMBINE_PTR_LABEL: load i16*
@ -152,4 +164,4 @@ define i64 @load64(i64* %p) {
%a = load i64* %p %a = load i64* %p
ret i64 %a ret i64 %a
} }

View File

@ -2,6 +2,19 @@
; RUN: opt < %s -dfsan -dfsan-combine-pointer-labels-on-store=0 -S | FileCheck %s --check-prefix=NO_COMBINE_PTR_LABEL ; RUN: opt < %s -dfsan -dfsan-combine-pointer-labels-on-store=0 -S | FileCheck %s --check-prefix=NO_COMBINE_PTR_LABEL
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
define void @store0({} %v, {}* %p) {
; COMBINE_PTR_LABEL: @"dfs$store0"
; COMBINE_PTR_LABEL: store
; COMBINE_PTR_LABEL-NOT: store
; NO_COMBINE_PTR_LABEL: @"dfs$store0"
; NO_COMBINE_PTR_LABEL: store
; NO_COMBINE_PTR_LABEL-NOT: store
store {} %v, {}* %p
ret void
}
define void @store8(i8 %v, i8* %p) { define void @store8(i8 %v, i8* %p) {
; NO_COMBINE_PTR_LABEL: @"dfs$store8" ; NO_COMBINE_PTR_LABEL: @"dfs$store8"
; NO_COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls ; NO_COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls