Changes from 3.7 merge to files not in upstream

test/Transforms/NaCl/rewrite-prefetch.ll

Index: test/Transforms/NaCl/rewrite-prefetch.ll
diff --git a/test/Transforms/NaCl/rewrite-prefetch.ll b/test/Transforms/NaCl/rewrite-prefetch.ll
index d498c2012ef0406281dd1da32a574e2155614548..0826bd32c98807229148e43e47b77480949fef58 100644
--- a/test/Transforms/NaCl/rewrite-prefetch.ll
+++ b/test/Transforms/NaCl/rewrite-prefetch.ll
@@ -7,29 +7,29 @@ declare void @llvm.prefetch(i8 *%ptr, i32 %rw, i32 %locality, i32 %cache_type)
 ; No declaration or definition of llvm.prefetch() should remain.
 ; CLEANED-NOT: @llvm.prefetch
 
-define void @call_prefetch(i8 *%ptr, i32 %rw, i32 %locality, i32 %cache_type) {
+define void @call_prefetch(i8 *%ptr) {
 ; CHECK: call_prefetch
 ; CHECK-NEXT: ret void
-  call void @llvm.prefetch(i8 *%ptr, i32 %rw, i32 %locality, i32 %cache_type)
+  call void @llvm.prefetch(i8 *%ptr, i32 0, i32 0, i32 0)
   ret void
 }
 
 ; A more complex example with a number of calls in several BBs.
-define void @multiple_calls(i8 *%ptr, i32 %rw, i32 %locality, i32 %cache_type) {
+define void @multiple_calls(i8 *%ptr) {
 ; CHECK: multiple_calls
 entryblock:
 ; CHECK: entryblock
 ; CHECK-NEXT: br
-  call void @llvm.prefetch(i8 *%ptr, i32 %rw, i32 %locality, i32 %cache_type)
+  call void @llvm.prefetch(i8 *%ptr, i32 1, i32 2, i32 1)
   br label %block1
 block1:
 ; CHECK: block1:
 ; CHECK-NEXT: br
-  call void @llvm.prefetch(i8 *%ptr, i32 %rw, i32 %locality, i32 %cache_type)
+  call void @llvm.prefetch(i8 *%ptr, i32 0, i32 1, i32 0)
   br label %exitblock
 exitblock:
 ; CHECK: exitblock:
 ; CHECK-NEXT: ret void
-  call void @llvm.prefetch(i8 *%ptr, i32 %rw, i32 %locality, i32 %cache_type)
+  call void @llvm.prefetch(i8 *%ptr, i32 1, i32 3, i32 1)
   ret void
 }