Update to LLVM 3.5a.

Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617

2 files changed, 256 insertions, 111 deletions

diff --git a/test/Instrumentation/DataFlowSanitizer/load.ll b/test/Instrumentation/DataFlowSanitizer/load.ll
index 6431213..6cd5151 100644
--- a/test/Instrumentation/DataFlowSanitizer/load.ll
+++ b/test/Instrumentation/DataFlowSanitizer/load.ll
@@ -1,81 +1,155 @@
-; RUN: opt < %s -dfsan -S | FileCheck %s
+; RUN: opt < %s -dfsan -dfsan-combine-pointer-labels-on-load=1 -S | FileCheck %s --check-prefix=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"
 
 define i8 @load8(i8* %p) {
-  ; CHECK: @"dfs$load8"
-  ; CHECK: ptrtoint
-  ; CHECK: and
-  ; CHECK: mul
-  ; CHECK: inttoptr
-  ; CHECK: load
-  ; CHECK: store{{.*}}__dfsan_retval_tls
-  ; CHECK: ret i8
+  ; COMBINE_PTR_LABEL: @"dfs$load8"
+  ; COMBINE_PTR_LABEL: load i16*
+  ; COMBINE_PTR_LABEL: ptrtoint i8* {{.*}} to i64
+  ; COMBINE_PTR_LABEL: and i64
+  ; COMBINE_PTR_LABEL: mul i64
+  ; COMBINE_PTR_LABEL: inttoptr i64
+  ; COMBINE_PTR_LABEL: load i16*
+  ; COMBINE_PTR_LABEL: icmp ne i16
+  ; COMBINE_PTR_LABEL: call zeroext i16 @__dfsan_union
+  ; COMBINE_PTR_LABEL: load i8*
+  ; COMBINE_PTR_LABEL: store i16 {{.*}} @__dfsan_retval_tls
+  ; COMBINE_PTR_LABEL: ret i8
+
+  ; NO_COMBINE_PTR_LABEL: @"dfs$load8"
+  ; NO_COMBINE_PTR_LABEL: ptrtoint i8*
+  ; NO_COMBINE_PTR_LABEL: and i64
+  ; NO_COMBINE_PTR_LABEL: mul i64
+  ; NO_COMBINE_PTR_LABEL: inttoptr i64 {{.*}} to i16*
+  ; NO_COMBINE_PTR_LABEL: load i16*
+  ; NO_COMBINE_PTR_LABEL: load i8*
+  ; NO_COMBINE_PTR_LABEL: store i16 {{.*}} @__dfsan_retval_tls
+  ; NO_COMBINE_PTR_LABEL: ret i8
+
   %a = load i8* %p
   ret i8 %a
 }
 
 define i16 @load16(i16* %p) {
-  ; CHECK: @"dfs$load16"
-  ; CHECK: ptrtoint
-  ; CHECK: and
-  ; CHECK: mul
-  ; CHECK: inttoptr
-  ; CHECK: load
-  ; CHECK: load
-  ; CHECK: icmp ne
-  ; CHECK: call{{.*}}__dfsan_union
-  ; CHECK: store{{.*}}__dfsan_retval_tls
-  ; CHECK: ret i16
+  ; COMBINE_PTR_LABEL: @"dfs$load16"
+  ; COMBINE_PTR_LABEL: ptrtoint i16*
+  ; COMBINE_PTR_LABEL: and i64
+  ; COMBINE_PTR_LABEL: mul i64
+  ; COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; COMBINE_PTR_LABEL: getelementptr i16
+  ; COMBINE_PTR_LABEL: load i16*
+  ; COMBINE_PTR_LABEL: load i16*
+  ; COMBINE_PTR_LABEL: icmp ne
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; COMBINE_PTR_LABEL: icmp ne i16
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; COMBINE_PTR_LABEL: load i16*
+  ; COMBINE_PTR_LABEL: store {{.*}} @__dfsan_retval_tls
+  ; COMBINE_PTR_LABEL: ret i16
+
+  ; NO_COMBINE_PTR_LABEL: @"dfs$load16"
+  ; NO_COMBINE_PTR_LABEL: ptrtoint i16*
+  ; NO_COMBINE_PTR_LABEL: and i64
+  ; NO_COMBINE_PTR_LABEL: mul i64
+  ; NO_COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; NO_COMBINE_PTR_LABEL: getelementptr i16*
+  ; NO_COMBINE_PTR_LABEL: load i16*
+  ; NO_COMBINE_PTR_LABEL: load i16*
+  ; NO_COMBINE_PTR_LABEL: icmp ne i16
+  ; NO_COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; NO_COMBINE_PTR_LABEL: load i16*
+  ; NO_COMBINE_PTR_LABEL: store i16 {{.*}} @__dfsan_retval_tls
+  ; NO_COMBINE_PTR_LABEL: ret i16
+
   %a = load i16* %p
   ret i16 %a
 }
 
 define i32 @load32(i32* %p) {
-  ; CHECK: @"dfs$load32"
-  ; CHECK: ptrtoint
-  ; CHECK: and
-  ; CHECK: mul
-  ; CHECK: inttoptr
-  ; CHECK: bitcast
-  ; CHECK: load
-  ; CHECK: trunc
-  ; CHECK: shl
-  ; CHECK: lshr
-  ; CHECK: or
-  ; CHECK: icmp eq
+  ; COMBINE_PTR_LABEL: @"dfs$load32"
+  ; COMBINE_PTR_LABEL: ptrtoint i32*
+  ; COMBINE_PTR_LABEL: and i64
+  ; COMBINE_PTR_LABEL: mul i64
+  ; COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; COMBINE_PTR_LABEL: bitcast i16* {{.*}} i64*
+  ; COMBINE_PTR_LABEL: load i64*
+  ; COMBINE_PTR_LABEL: trunc i64 {{.*}} i16
+  ; COMBINE_PTR_LABEL: shl i64
+  ; COMBINE_PTR_LABEL: lshr i64
+  ; COMBINE_PTR_LABEL: or i64
+  ; COMBINE_PTR_LABEL: icmp eq i64
+  ; COMBINE_PTR_LABEL: icmp ne i16
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; COMBINE_PTR_LABEL: load i32*
+  ; COMBINE_PTR_LABEL: store i16 {{.*}} @__dfsan_retval_tls
+  ; COMBINE_PTR_LABEL: ret i32
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union_load
 
-  ; CHECK: store{{.*}}__dfsan_retval_tls
-  ; CHECK: ret i32
-
-  ; CHECK: call{{.*}}__dfsan_union_load
+  ; NO_COMBINE_PTR_LABEL: @"dfs$load32"
+  ; NO_COMBINE_PTR_LABEL: ptrtoint i32*
+  ; NO_COMBINE_PTR_LABEL: and i64
+  ; NO_COMBINE_PTR_LABEL: mul i64
+  ; NO_COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; NO_COMBINE_PTR_LABEL: bitcast i16* {{.*}} i64*
+  ; NO_COMBINE_PTR_LABEL: load i64*
+  ; NO_COMBINE_PTR_LABEL: trunc i64 {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: shl i64
+  ; NO_COMBINE_PTR_LABEL: lshr i64
+  ; NO_COMBINE_PTR_LABEL: or i64
+  ; NO_COMBINE_PTR_LABEL: icmp eq i64
+  ; NO_COMBINE_PTR_LABEL: load i32*
+  ; NO_COMBINE_PTR_LABEL: store i16 {{.*}} @__dfsan_retval_tls
+  ; NO_COMBINE_PTR_LABEL: ret i32
+  ; NO_COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union_load
+  
 
   %a = load i32* %p
   ret i32 %a
 }
 
 define i64 @load64(i64* %p) {
-  ; CHECK: @"dfs$load64"
-  ; CHECK: ptrtoint
-  ; CHECK: and
-  ; CHECK: mul
-  ; CHECK: inttoptr
-  ; CHECK: bitcast
-  ; CHECK: load
-  ; CHECK: trunc
-  ; CHECK: shl
-  ; CHECK: lshr
-  ; CHECK: or
-  ; CHECK: icmp eq
-
-  ; CHECK: store{{.*}}__dfsan_retval_tls
-  ; CHECK: ret i64
+  ; COMBINE_PTR_LABEL: @"dfs$load64"
+  ; COMBINE_PTR_LABEL: ptrtoint i64*
+  ; COMBINE_PTR_LABEL: and i64
+  ; COMBINE_PTR_LABEL: mul i64
+  ; COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; COMBINE_PTR_LABEL: bitcast i16* {{.*}} i64*
+  ; COMBINE_PTR_LABEL: load i64*
+  ; COMBINE_PTR_LABEL: trunc i64 {{.*}} i16
+  ; COMBINE_PTR_LABEL: shl i64
+  ; COMBINE_PTR_LABEL: lshr i64
+  ; COMBINE_PTR_LABEL: or i64
+  ; COMBINE_PTR_LABEL: icmp eq i64
+  ; COMBINE_PTR_LABEL: icmp ne i16
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; COMBINE_PTR_LABEL: load i64*
+  ; COMBINE_PTR_LABEL: store i16 {{.*}} @__dfsan_retval_tls
+  ; COMBINE_PTR_LABEL: ret i64
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union_load
+  ; COMBINE_PTR_LABEL: getelementptr i64* {{.*}} i64
+  ; COMBINE_PTR_LABEL: load i64*
+  ; COMBINE_PTR_LABEL: icmp eq i64
 
-  ; CHECK: call{{.*}}__dfsan_union_load
-
-  ; CHECK: getelementptr
-  ; CHECK: load
-  ; CHECK: icmp eq
+  ; NO_COMBINE_PTR_LABEL: @"dfs$load64"
+  ; NO_COMBINE_PTR_LABEL: ptrtoint i64*
+  ; NO_COMBINE_PTR_LABEL: and i64
+  ; NO_COMBINE_PTR_LABEL: mul i64
+  ; NO_COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; NO_COMBINE_PTR_LABEL: bitcast i16* {{.*}} i64*
+  ; NO_COMBINE_PTR_LABEL: load i64*
+  ; NO_COMBINE_PTR_LABEL: trunc i64 {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: shl i64
+  ; NO_COMBINE_PTR_LABEL: lshr i64
+  ; NO_COMBINE_PTR_LABEL: or i64
+  ; NO_COMBINE_PTR_LABEL: icmp eq i64
+  ; NO_COMBINE_PTR_LABEL: load i64*
+  ; NO_COMBINE_PTR_LABEL: store i16 {{.*}} @__dfsan_retval_tls
+  ; NO_COMBINE_PTR_LABEL: ret i64
+  ; NO_COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union_load
+  ; NO_COMBINE_PTR_LABEL: getelementptr i64* {{.*}} i64
+  ; NO_COMBINE_PTR_LABEL: load i64*
+  ; NO_COMBINE_PTR_LABEL: icmp eq i64
 
   %a = load i64* %p
   ret i64 %a
-}
+}
\ No newline at end of file
diff --git a/test/Instrumentation/DataFlowSanitizer/store.ll b/test/Instrumentation/DataFlowSanitizer/store.ll
index 9509177..8060537 100644
--- a/test/Instrumentation/DataFlowSanitizer/store.ll
+++ b/test/Instrumentation/DataFlowSanitizer/store.ll
@@ -1,75 +1,146 @@
-; RUN: opt < %s -dfsan -S | FileCheck %s
+; RUN: opt < %s -dfsan -dfsan-combine-pointer-labels-on-store=1 -S | FileCheck %s --check-prefix=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"
 
 define void @store8(i8 %v, i8* %p) {
-  ; CHECK: @"dfs$store8"
-  ; CHECK: load{{.*}}__dfsan_arg_tls
-  ; CHECK: ptrtoint
-  ; CHECK: and
-  ; CHECK: mul
-  ; CHECK: inttoptr
-  ; CHECK: getelementptr
-  ; CHECK: store
-  ; CHECK: store
+  ; NO_COMBINE_PTR_LABEL: @"dfs$store8"
+  ; NO_COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; NO_COMBINE_PTR_LABEL: ptrtoint i8* {{.*}} i64
+  ; NO_COMBINE_PTR_LABEL: and i64
+  ; NO_COMBINE_PTR_LABEL: mul i64
+  ; NO_COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; NO_COMBINE_PTR_LABEL: getelementptr i16*
+  ; NO_COMBINE_PTR_LABEL: store i16
+  ; NO_COMBINE_PTR_LABEL: store i8
+
+  ; COMBINE_PTR_LABEL: @"dfs$store8"
+  ; COMBINE_PTR_LABEL: load i16*
+  ; COMBINE_PTR_LABEL: load i16*
+  ; COMBINE_PTR_LABEL: icmp ne i16
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; COMBINE_PTR_LABEL: ptrtoint i8* {{.*}} i64
+  ; COMBINE_PTR_LABEL: and i64
+  ; COMBINE_PTR_LABEL: mul i64
+  ; COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; COMBINE_PTR_LABEL: getelementptr i16*
+  ; COMBINE_PTR_LABEL: store i16
+  ; COMBINE_PTR_LABEL: store i8
+
   store i8 %v, i8* %p
   ret void
 }
 
 define void @store16(i16 %v, i16* %p) {
-  ; CHECK: @"dfs$store16"
-  ; CHECK: load{{.*}}__dfsan_arg_tls
-  ; CHECK: ptrtoint
-  ; CHECK: and
-  ; CHECK: mul
-  ; CHECK: inttoptr
-  ; CHECK: getelementptr
-  ; CHECK: store
-  ; CHECK: getelementptr
-  ; CHECK: store
-  ; CHECK: store
+  ; NO_COMBINE_PTR_LABEL: @"dfs$store16"
+  ; NO_COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; NO_COMBINE_PTR_LABEL: ptrtoint i16* {{.*}} i64
+  ; NO_COMBINE_PTR_LABEL: and i64
+  ; NO_COMBINE_PTR_LABEL: mul i64
+  ; NO_COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; NO_COMBINE_PTR_LABEL: getelementptr i16*
+  ; NO_COMBINE_PTR_LABEL: store i16
+  ; NO_COMBINE_PTR_LABEL: getelementptr i16*
+  ; NO_COMBINE_PTR_LABEL: store i16
+  ; NO_COMBINE_PTR_LABEL: store i16
+
+  ; COMBINE_PTR_LABEL: @"dfs$store16"
+  ; COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; COMBINE_PTR_LABEL: icmp ne i16
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; COMBINE_PTR_LABEL: ptrtoint i16* {{.*}} i64
+  ; COMBINE_PTR_LABEL: and i64
+  ; COMBINE_PTR_LABEL: mul i64
+  ; COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; COMBINE_PTR_LABEL: getelementptr i16*
+  ; COMBINE_PTR_LABEL: store i16
+  ; COMBINE_PTR_LABEL: getelementptr i16*
+  ; COMBINE_PTR_LABEL: store i16
+  ; COMBINE_PTR_LABEL: store i16
+
   store i16 %v, i16* %p
   ret void
 }
 
 define void @store32(i32 %v, i32* %p) {
-  ; CHECK: @"dfs$store32"
-  ; CHECK: load{{.*}}__dfsan_arg_tls
-  ; CHECK: ptrtoint
-  ; CHECK: and
-  ; CHECK: mul
-  ; CHECK: inttoptr
-  ; CHECK: getelementptr
-  ; CHECK: store
-  ; CHECK: getelementptr
-  ; CHECK: store
-  ; CHECK: getelementptr
-  ; CHECK: store
-  ; CHECK: getelementptr
-  ; CHECK: store
-  ; CHECK: store
+  ; NO_COMBINE_PTR_LABEL: @"dfs$store32"
+  ; NO_COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; NO_COMBINE_PTR_LABEL: ptrtoint i32* {{.*}} i64
+  ; NO_COMBINE_PTR_LABEL: and i64
+  ; NO_COMBINE_PTR_LABEL: mul i64
+  ; NO_COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; NO_COMBINE_PTR_LABEL: getelementptr i16*
+  ; NO_COMBINE_PTR_LABEL: store i16
+  ; NO_COMBINE_PTR_LABEL: getelementptr i16*
+  ; NO_COMBINE_PTR_LABEL: store i16
+  ; NO_COMBINE_PTR_LABEL: getelementptr i16*
+  ; NO_COMBINE_PTR_LABEL: store i16
+  ; NO_COMBINE_PTR_LABEL: getelementptr i16*
+  ; NO_COMBINE_PTR_LABEL: store i16
+  ; NO_COMBINE_PTR_LABEL: store i32
+
+  ; COMBINE_PTR_LABEL: @"dfs$store32"
+  ; COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; COMBINE_PTR_LABEL: icmp ne i16
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; COMBINE_PTR_LABEL: ptrtoint i32* {{.*}} i64
+  ; COMBINE_PTR_LABEL: and i64
+  ; COMBINE_PTR_LABEL: mul i64
+  ; COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; COMBINE_PTR_LABEL: getelementptr i16*
+  ; COMBINE_PTR_LABEL: store i16
+  ; COMBINE_PTR_LABEL: getelementptr i16*
+  ; COMBINE_PTR_LABEL: store i16
+  ; COMBINE_PTR_LABEL: getelementptr i16*
+  ; COMBINE_PTR_LABEL: store i16
+  ; COMBINE_PTR_LABEL: getelementptr i16*
+  ; COMBINE_PTR_LABEL: store i16
+  ; COMBINE_PTR_LABEL: store i32
+
   store i32 %v, i32* %p
   ret void
 }
 
 define void @store64(i64 %v, i64* %p) {
-  ; CHECK: @"dfs$store64"
-  ; CHECK: load{{.*}}__dfsan_arg_tls
-  ; CHECK: ptrtoint
-  ; CHECK: and
-  ; CHECK: mul
-  ; CHECK: inttoptr
-  ; CHECK: insertelement
-  ; CHECK: insertelement
-  ; CHECK: insertelement
-  ; CHECK: insertelement
-  ; CHECK: insertelement
-  ; CHECK: insertelement
-  ; CHECK: insertelement
-  ; CHECK: insertelement
-  ; CHECK: bitcast
-  ; CHECK: getelementptr
-  ; CHECK: store
-  ; CHECK: store
+  ; NO_COMBINE_PTR_LABEL: @"dfs$store64"
+  ; NO_COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; NO_COMBINE_PTR_LABEL: ptrtoint i64* {{.*}} i64
+  ; NO_COMBINE_PTR_LABEL: and i64
+  ; NO_COMBINE_PTR_LABEL: mul i64
+  ; NO_COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; NO_COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; NO_COMBINE_PTR_LABEL: bitcast i16* {{.*}} <8 x i16>*
+  ; NO_COMBINE_PTR_LABEL: store i64
+
+  ; COMBINE_PTR_LABEL: @"dfs$store64"
+  ; COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; COMBINE_PTR_LABEL: load i16* {{.*}} @__dfsan_arg_tls
+  ; COMBINE_PTR_LABEL: icmp ne i16
+  ; COMBINE_PTR_LABEL: call {{.*}} @__dfsan_union
+  ; COMBINE_PTR_LABEL: ptrtoint i64* {{.*}} i64
+  ; COMBINE_PTR_LABEL: and i64
+  ; COMBINE_PTR_LABEL: mul i64
+  ; COMBINE_PTR_LABEL: inttoptr i64 {{.*}} i16*
+  ; COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; COMBINE_PTR_LABEL: insertelement {{.*}} i16
+  ; COMBINE_PTR_LABEL: bitcast i16* {{.*}} <8 x i16>*
+  ; COMBINE_PTR_LABEL: store <8 x i16>
+  ; COMBINE_PTR_LABEL: store i64
+
   store i64 %v, i64* %p
   ret void
 }