Update aosp/master LLVM for rebase to r256229

http://b/26987366

Change-Id: I1f29c4676a8abe633ab5707dded58d846c973d50
diff --git a/test/Transforms/SimplifyCFG/preserve-make-implicit-on-switch-to-br.ll b/test/Transforms/SimplifyCFG/preserve-make-implicit-on-switch-to-br.ll
new file mode 100644
index 0000000..0e95336
--- /dev/null
+++ b/test/Transforms/SimplifyCFG/preserve-make-implicit-on-switch-to-br.ll
@@ -0,0 +1,30 @@
+; RUN: opt %s -simplifycfg -S | FileCheck %s
+
+; ConstantFoldTerminator function can convert SwitchInst with one case (and default) to
+; a conditional BranchInst. This test checks the converted BranchInst preserve the 
+; make.implicit metadata.
+
+declare i32 @consume(i32*)
+declare void @trap()
+
+define i32 @copy-metadata(i32* %x) {
+
+entry:
+  %x.int = ptrtoint i32* %x to i64
+  
+; CHECK: br i1 %cond, label %is_null, label %default, !make.implicit !0
+  switch i64 %x.int, label %default [
+    i64 0, label %is_null
+  ], !make.implicit !0
+  
+default:
+  %0 = call i32 @consume(i32* %x)
+  ret i32 %0
+
+is_null:
+  call void @trap()
+  unreachable
+}
+
+!0 = !{}
+