This is an archive of the discontinued LLVM Phabricator instance.

Differential D23512

[msan] Fix line number sensitivity in chained_origin.cc and chained_origin_memcpy.cc
ClosedPublic

Authored by dsanders on Aug 15 2016, 8:37 AM.

Details

Reviewers
eugenis
Commits
rGdab0556112e9: [msan] Fix line number sensitivity in chained_origin.cc and…
rCRT278712: [msan] Fix line number sensitivity in chained_origin.cc and…
rL278712: [msan] Fix line number sensitivity in chained_origin.cc and…

Diff Detail

Repository
rL LLVM

Event Timeline

dsanders updated this revision to Diff 68040.Aug 15 2016, 8:37 AM
dsanders retitled this revision from to [msan] Fix line number sensitivity in chained_origin.cc and chained_origin_memcpy.cc.
dsanders updated this object.
dsanders added a subscriber: llvm-commits.
dsanders mentioned this in D23515: [msan] Correct @LINE expression in obstack.cc.Aug 15 2016, 9:06 AM
eugenis accepted this revision.Aug 15 2016, 10:17 AM
eugenis added a reviewer: eugenis.
eugenis added a subscriber: eugenis.

LGTM

This revision is now accepted and ready to land.Aug 15 2016, 10:17 AM
Closed by commit rL278712: [msan] Fix line number sensitivity in chained_origin.cc and… (authored by dsanders). · Explain WhyAug 15 2016, 11:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
trunk/
test/
msan/
17 lines
11 lines

Diff 68055

compiler-rt/trunk/test/msan/chained_origin.cc

// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O3 %s -o %t && \ // RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O3 %s -o %t && \
// RUN: not %run %t >%t.out 2>&1 // RUN: not %run %t >%t.out 2>&1
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-STACK < %t.out // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-STACK < %t.out
// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DHEAP=1 -O3 %s -o %t && \ // RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DHEAP=1 -O3 %s -o %t && \
// RUN: not %run %t >%t.out 2>&1 // RUN: not %run %t >%t.out 2>&1
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-HEAP < %t.out // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-HEAP < %t.out
// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -O3 %s -o %t && \ // RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -O3 %s -o %t && \
// RUN: not %run %t >%t.out 2>&1 // RUN: not %run %t >%t.out 2>&1
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-STACK < %t.out // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-STACK < %t.out
// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DHEAP=1 -O3 %s -o %t && \ // RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DHEAP=1 -O3 %s -o %t && \
// RUN: not %run %t >%t.out 2>&1 // RUN: not %run %t >%t.out 2>&1
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-HEAP < %t.out // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-HEAP < %t.out
// XFAIL: target-is-mips64el // XFAIL: target-is-mips64el
#include <stdio.h> #include <stdio.h>
volatile int x, y; volatile int x, y;
__attribute__((noinline)) __attribute__((noinline))
void fn_g(int a) { void fn_g(int a) {
Show All 18 Lines#else
int volatile z; int volatile z;
#endif #endif
fn_f(z); fn_f(z);
fn_h(); fn_h();
return y; return y;
} }
// CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
// CHECK: {{#0 .* in main.*chained_origin.cc:47}} // CHECK: {{#0 .* in main.*chained_origin.cc:}}[[@LINE-4]]
// CHECK: Uninitialized value was stored to memory at // CHECK: Uninitialized value was stored to memory at
// CHECK: {{#0 .* in fn_h.*chained_origin.cc:35}} // CHECK: {{#0 .* in fn_h.*chained_origin.cc:}}[[@LINE-19]]
// CHECK: {{#1 .* in main.*chained_origin.cc:46}} // CHECK: {{#1 .* in main.*chained_origin.cc:}}[[@LINE-9]]
// CHECK: Uninitialized value was stored to memory at // CHECK: Uninitialized value was stored to memory at
// CHECK: {{#0 .* in fn_g.*chained_origin.cc:25}} // CHECK: {{#0 .* in fn_g.*chained_origin.cc:}}[[@LINE-33]]
// CHECK: {{#1 .* in fn_f.*chained_origin.cc:30}} // CHECK: {{#1 .* in fn_f.*chained_origin.cc:}}[[@LINE-29]]
// CHECK: {{#2 .* in main.*chained_origin.cc:45}} // CHECK: {{#2 .* in main.*chained_origin.cc:}}[[@LINE-15]]
// CHECK-STACK: Uninitialized value was created by an allocation of 'z' in the stack frame of function 'main' // CHECK-STACK: Uninitialized value was created by an allocation of 'z' in the stack frame of function 'main'
// CHECK-STACK: {{#0 .* in main.*chained_origin.cc:38}} // CHECK-STACK: {{#0 .* in main.*chained_origin.cc:}}[[@LINE-25]]
// CHECK-HEAP: Uninitialized value was created by a heap allocation // CHECK-HEAP: Uninitialized value was created by a heap allocation
// CHECK-HEAP: {{#1 .* in main.*chained_origin.cc:40}} // CHECK-HEAP: {{#1 .* in main.*chained_origin.cc:}}[[@LINE-26]]

compiler-rt/trunk/test/msan/chained_origin_memcpy.cc

// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DOFFSET=0 -O3 %s -o %t && \ // RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DOFFSET=0 -O3 %s -o %t && \
// RUN: not %run %t >%t.out 2>&1 // RUN: not %run %t >%t.out 2>&1
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z1 < %t.out // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z1 < %t.out
// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DOFFSET=10 -O3 %s -o %t && \ // RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -DOFFSET=10 -O3 %s -o %t && \
// RUN: not %run %t >%t.out 2>&1 // RUN: not %run %t >%t.out 2>&1
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z2 < %t.out // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z2 < %t.out
// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DOFFSET=0 -O3 %s -o %t && \ // RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DOFFSET=0 -O3 %s -o %t && \
// RUN: not %run %t >%t.out 2>&1 // RUN: not %run %t >%t.out 2>&1
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z1 < %t.out // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z1 < %t.out
// RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DOFFSET=10 -O3 %s -o %t && \ // RUN: %clangxx_msan -mllvm -msan-instrumentation-with-call-threshold=0 -fsanitize-memory-track-origins=2 -DOFFSET=10 -O3 %s -o %t && \
// RUN: not %run %t >%t.out 2>&1 // RUN: not %run %t >%t.out 2>&1
// RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z2 < %t.out // RUN: FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-Z2 < %t.out
// XFAIL: target-is-mips64el // XFAIL: target-is-mips64el
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
int xx[10000]; int xx[10000];
int yy[10000]; int yy[10000];
volatile int idx = 30; volatile int idx = 30;
Show All 17 Linesint main(int argc, char *argv[]) {
int volatile z1; int volatile z1;
int volatile z2; int volatile z2;
fn_f(z1, z2); fn_f(z1, z2);
fn_h(); fn_h();
return yy[idx + OFFSET]; return yy[idx + OFFSET];
} }
// CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value
// CHECK: {{#0 .* in main .*chained_origin_memcpy.cc:46}} // CHECK: {{#0 .* in main .*chained_origin_memcpy.cc:}}[[@LINE-4]]
// CHECK: Uninitialized value was stored to memory at // CHECK: Uninitialized value was stored to memory at
// CHECK: {{#1 .* in fn_h.*chained_origin_memcpy.cc:38}} // CHECK: {{#1 .* in fn_h.*chained_origin_memcpy.cc:}}[[@LINE-15]]
// CHECK: Uninitialized value was stored to memory at // CHECK: Uninitialized value was stored to memory at
// CHECK: {{#0 .* in fn_g.*chained_origin_memcpy.cc:28}} // CHECK: {{#0 .* in fn_g.*chained_origin_memcpy.cc:}}[[@LINE-28]]
// CHECK: {{#1 .* in fn_f.*chained_origin_memcpy.cc:33}} // CHECK: {{#1 .* in fn_f.*chained_origin_memcpy.cc:}}[[@LINE-24]]
// CHECK-Z1: Uninitialized value was created by an allocation of 'z1' in the stack frame of function 'main' // CHECK-Z1: Uninitialized value was created by an allocation of 'z1' in the stack frame of function 'main'
// CHECK-Z2: Uninitialized value was created by an allocation of 'z2' in the stack frame of function 'main' // CHECK-Z2: Uninitialized value was created by an allocation of 'z2' in the stack frame of function 'main'
// CHECK: {{#0 .* in main.*chained_origin_memcpy.cc:41}} // CHECK: {{#0 .* in main.*chained_origin_memcpy.cc:}}[[@LINE-20]]