src - FreeBSD source tree

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2017-01-24 19:17:53 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2017-01-24 19:17:53 +0000
commit	02a336801959d4fc2ea0657d4489596e1ecbfee0 (patch)
tree	776cc4ed9ad3080c3c6afbb0ffb73177c40292e8 /test
parent	7c71d32ab52480cb7bfd9f951450060263a5b9e7 (diff)
download	src-02a336801959d4fc2ea0657d4489596e1ecbfee0.tar.gz src-02a336801959d4fc2ea0657d4489596e1ecbfee0.zip

Vendor import of llvm release_40 branch r292951:vendor/llvm/llvm-release_40-r292951

https://llvm.org/svn/llvm-project/llvm/branches/release_40@292951

Notes

Notes: svn path=/vendor/llvm/dist/; revision=312704 svn path=/vendor/llvm/llvm-release_40-r292951/; revision=312705; tag=vendor/llvm/llvm-release_40-r292951

Diffstat (limited to 'test')

-rw-r--r--

test/CodeGen/AArch64/ldst-opt-dbg-limit.mir

133

-rw-r--r--

test/CodeGen/AArch64/ldst-opt.mir

132

-rw-r--r--

test/CodeGen/Thumb2/float-intrinsics-double.ll

-rw-r--r--

test/CodeGen/Thumb2/float-intrinsics-float.ll

-rw-r--r--

test/CodeGen/Thumb2/intrinsics-cc.ll

-rw-r--r--

test/CodeGen/X86/sse1.ll

133

-rw-r--r--

test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll

-rw-r--r--

test/ThinLTO/X86/lazyload_metadata.ll

-rw-r--r--

test/Transforms/NewGVN/pr31682.ll

-rw-r--r--

test/tools/llvm-cxxfilt/invalid.test

10 files changed, 366 insertions, 142 deletions

diff --git a/test/CodeGen/AArch64/ldst-opt-dbg-limit.mir b/test/CodeGen/AArch64/ldst-opt-dbg-limit.mir
deleted file mode 100644
index 45542cae98fa..000000000000
--- a/test/CodeGen/AArch64/ldst-opt-dbg-limit.mir
+++ /dev/null

@@ -1,133 +0,0 @@

-# RUN: llc -run-pass=aarch64-ldst-opt %s -o - 2>&1 | FileCheck %s

---- |

- target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"

- target triple = "aarch64--linux-gnu"

- ; Function Attrs: nounwind

- define i16 @promote-load-from-store(i32* %dst, i32 %x) #0 {

- store i32 %x, i32* %dst

- %dst16 = bitcast i32* %dst to i16*

- %dst1 = getelementptr inbounds i16, i16* %dst16, i32 1

- %x16 = load i16, i16* %dst1

- ret i16 %x16

- }

- ; Function Attrs: nounwind

- define void @store-pair(i32* %dst, i32 %x, i32 %y) #0 {

- %dst01 = bitcast i32* %dst to i32*

- %dst1 = getelementptr inbounds i32, i32* %dst, i32 1

- store i32 %x, i32* %dst01

- store i32 %x, i32* %dst1

- ret void

- }

- attributes #0 = { nounwind }

-...

----

-name: promote-load-from-store

-alignment: 2

-exposesReturnsTwice: false

-tracksRegLiveness: true

-liveins:

- - { reg: '%x0' }

- - { reg: '%w1' }

-frameInfo:

- isFrameAddressTaken: false

- isReturnAddressTaken: false

- hasStackMap: false

- hasPatchPoint: false

- stackSize: 0

- offsetAdjustment: 0

- maxAlignment: 0

- adjustsStack: false

- hasCalls: false

- maxCallFrameSize: 0

- hasOpaqueSPAdjustment: false

- hasVAStart: false

- hasMustTailInVarArgFunc: false

-body: |

- bb.0 (%ir-block.0):

- liveins: %w1, %x0, %lr

- STRWui killed %w1, %x0, 0 :: (store 4 into %ir.dst)

- CFI_INSTRUCTION 0

- %w0 = LDRHHui killed %x0, 1 :: (load 2 from %ir.dst1)

- RET %lr, implicit %w0

-...

-# CHECK-LABEL: name: promote-load-from-store

-# CHECK: STRWui %w1

-# CHECK: UBFMWri %w1

----

-name: store-pair

-alignment: 2

-exposesReturnsTwice: false

-tracksRegLiveness: true

-liveins:

- - { reg: '%x0' }

- - { reg: '%w1' }

-frameInfo:

- isFrameAddressTaken: false

- isReturnAddressTaken: false

- hasStackMap: false

- hasPatchPoint: false

- stackSize: 0

- offsetAdjustment: 0

- maxAlignment: 0

- adjustsStack: false

- hasCalls: false

- maxCallFrameSize: 0

- hasOpaqueSPAdjustment: false

- hasVAStart: false

- hasMustTailInVarArgFunc: false

-body: |

- bb.0 (%ir-block.0):

- liveins: %w1, %x0, %lr

- STRWui %w1, %x0, 0 :: (store 4 into %ir.dst01)

- CFI_INSTRUCTION 0

- STRWui killed %w1, killed %x0, 1 :: (store 4 into %ir.dst1)

- RET %lr

-...

-# CHECK-LABEL: name: store-pair

-# CHECK: STPWi

diff --git a/test/CodeGen/AArch64/ldst-opt.mir b/test/CodeGen/AArch64/ldst-opt.mir
new file mode 100644
index 000000000000..8f0b71be3483
--- /dev/null
+++ b/test/CodeGen/AArch64/ldst-opt.mir

@@ -0,0 +1,132 @@

+# RUN: llc -mtriple=aarch64--linux-gnu -run-pass=aarch64-ldst-opt %s -verify-machineinstrs -o - 2>&1 | FileCheck %s

+--- |

+ define void @promote-load-from-store() { ret void }

+ define void @store-pair() { ret void }

+ define void @store-pair-clearkill0() { ret void }

+ define void @store-pair-clearkill1() { ret void }

+...

+---

+name: promote-load-from-store

+tracksRegLiveness: true

+body: |

+ bb.0:

+ liveins: %w1, %x0, %lr

+ STRWui killed %w1, %x0, 0 :: (store 4)

+ CFI_INSTRUCTION 0

+ %w0 = LDRHHui killed %x0, 1 :: (load 2)

+ RET %lr, implicit %w0

+...

+# Don't count transient instructions towards search limits.

+# CHECK-LABEL: name: promote-load-from-store

+# CHECK: STRWui %w1

+# CHECK: UBFMWri %w1

+---

+name: store-pair

+tracksRegLiveness: true

+body: |

+ bb.0:

+ liveins: %w1, %x0, %lr

+ STRWui %w1, %x0, 0 :: (store 4)

+ CFI_INSTRUCTION 0

+ STRWui killed %w1, killed %x0, 1 :: (store 4)

+ RET %lr

+...

+# CHECK-LABEL: name: store-pair

+# CHECK: STPWi

+---

+name: store-pair-clearkill0

+tracksRegLiveness: true

+body: |

+ bb.0:

+ liveins: %w1, %x0, %lr

+ STRWui %w1, %x0, 0 :: (store 4)

+ %w2 = COPY %w1

+ %x3 = COPY %x0

+ STRWui killed %w1, killed %x0, 1 :: (store 4)

+ RET %lr

+...

+# When merging a lower store with an upper one, we must clear kill flags on

+# the lower store.

+# CHECK-LABEL: store-pair-clearkill0

+# CHECK-NOT: STPWi %w1, killed %w1, %x0, 0 :: (store 4)

+# CHECK: STPWi %w1, %w1, %x0, 0 :: (store 4)

+# CHECK: %w2 = COPY %w1

+# CHECK: RET %lr

+---

+name: store-pair-clearkill1

+tracksRegLiveness: true

+body: |

+ bb.0:

+ liveins: %x0, %lr

+ %w1 = MOVi32imm 13

+ %w2 = MOVi32imm 7

+ STRWui %w1, %x0, 1 :: (store 4)

+ %w2 = COPY killed %w1

+ STRWui killed %w2, %x0, 0 :: (store 4)

+ %w1 = MOVi32imm 42

+ %w2 = MOVi32imm 7

+ STRWui %w1, %x0, 0 :: (store 4)

+ %w2 = COPY killed %w1

+ STRWui killed %w2, killed %x0, 1 :: (store 4)

+ RET %lr

+...

+# When merging an upper store with a lower one, kill flags along the way need

+# to be removed; In this case the kill flag on %w1.

+# CHECK-LABEL: store-pair-clearkill1

+# CHECK: %w1 = MOVi32imm

+# CHECK: %w2 = MOVi32imm

+# CHECK-NOT: %w2 = COPY killed %w1

+# CHECK: %w2 = COPY %w1

+# CHECK: STPWi killed %w2, %w1, %x0, 0

+# CHECK: %w1 = MOVi32imm

+# CHECK: %w2 = MOVi32imm

+# CHECK-NOT: %w2 = COPY killed %w1

+# CHECK: %w2 = COPY %w1

+# CHECK: STPWi %w1, killed %w2, killed %x0, 0

diff --git a/test/CodeGen/Thumb2/float-intrinsics-double.ll b/test/CodeGen/Thumb2/float-intrinsics-double.ll
index 9e9499083829..657d1b172da9 100644
--- a/test/CodeGen/Thumb2/float-intrinsics-double.ll
+++ b/test/CodeGen/Thumb2/float-intrinsics-double.ll

@@ -18,7 +18,7 @@ declare double @llvm.powi.f64(double %Val, i32 %power)

define double @powi_d(double %a, i32 %b) {

; CHECK-LABEL: powi_d:

; SOFT: {{(bl|b)}} __powidf2

-; HARD: bl __powidf2

+; HARD: b __powidf2

%1 = call double @llvm.powi.f64(double %a, i32 %b)

ret double %1

}

diff --git a/test/CodeGen/Thumb2/float-intrinsics-float.ll b/test/CodeGen/Thumb2/float-intrinsics-float.ll
index fda840d90f36..847aeacd2f91 100644
--- a/test/CodeGen/Thumb2/float-intrinsics-float.ll
+++ b/test/CodeGen/Thumb2/float-intrinsics-float.ll

@@ -18,7 +18,7 @@ declare float @llvm.powi.f32(float %Val, i32 %power)

define float @powi_f(float %a, i32 %b) {

; CHECK-LABEL: powi_f:

; SOFT: bl __powisf2

-; HARD: bl __powisf2

+; HARD: b __powisf2

%1 = call float @llvm.powi.f32(float %a, i32 %b)

ret float %1

}

diff --git a/test/CodeGen/Thumb2/intrinsics-cc.ll b/test/CodeGen/Thumb2/intrinsics-cc.ll
new file mode 100644
index 000000000000..ab5081e3ab92
--- /dev/null
+++ b/test/CodeGen/Thumb2/intrinsics-cc.ll

@@ -0,0 +1,41 @@

+; RUN: llc -mtriple thumbv7-unknown-none-eabi -float-abi soft -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MATCH

+; RUN: llc -mtriple thumbv7-unknown-none-eabi -float-abi hard -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MISMATCH -check-prefix CHECK-TO-SOFT

+; RUN: llc -mtriple thumbv7-unknown-none-eabihf -float-abi soft -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MISMATCH -check-prefix CHECK-TO-HARD

+; RUN: llc -mtriple thumbv7-unknown-none-eabihf -float-abi hard -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MATCH

+; RUN: llc -mtriple thumbv7-unknown-none-gnueabi -float-abi soft -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MATCH

+; RUN: llc -mtriple thumbv7-unknown-none-gnueabi -float-abi hard -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MISMATCH -check-prefix CHECK-TO-SOFT

+; RUN: llc -mtriple thumbv7-unknown-none-gnueabihf -float-abi soft -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MISMATCH -check-prefix CHECK-TO-HARD

+; RUN: llc -mtriple thumbv7-unknown-none-gnueabihf -float-abi hard -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MATCH

+; RUN: llc -mtriple thumbv7-unknown-none-musleabi -float-abi soft -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MATCH

+; RUN: llc -mtriple thumbv7-unknown-none-musleabi -float-abi hard -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MISMATCH -check-prefix CHECK-TO-SOFT

+; RUN: llc -mtriple thumbv7-unknown-none-musleabihf -float-abi soft -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MISMATCH -check-prefix CHECK-TO-HARD

+; RUN: llc -mtriple thumbv7-unknown-none-musleabihf -float-abi hard -filetype asm -o - %s | FileCheck %s -check-prefix CHECK-MATCH

+declare float @llvm.powi.f32(float, i32)

+define float @f(float %f, i32 %i) {

+entry:

+ %0 = call float @llvm.powi.f32(float %f, i32 %i)

+ ret float %0

+; CHECK-MATCH: b __powisf2

+; CHECK-MISMATCH: bl __powisf2

+; CHECK-TO-SOFT: vmov s0, r0

+; CHECK-TO-HARD: vmov r0, s0

+declare double @llvm.powi.f64(double, i32)

+define double @g(double %d, i32 %i) {

+entry:

+ %0 = call double @llvm.powi.f64(double %d, i32 %i)

+ ret double %0

+; CHECK-MATCH: b __powidf2

+; CHECK-MISMATCH: bl __powidf2

+; CHECK-TO-SOFT: vmov d0, r0, r1

+; CHECK-TO-HARD: vmov r0, r1, d0

diff --git a/test/CodeGen/X86/sse1.ll b/test/CodeGen/X86/sse1.ll
index beedb1d24655..9488d6d26056 100644
--- a/test/CodeGen/X86/sse1.ll
+++ b/test/CodeGen/X86/sse1.ll

@@ -215,3 +215,136 @@ define <4 x i32> @PR30512(<4 x i32> %x, <4 x i32> %y) nounwind {

ret <4 x i32> %zext

}

+; Fragile test warning - we need to induce the generation of a vselect

+; post-legalization to cause the crash seen in:

+; https://llvm.org/bugs/show_bug.cgi?id=31672

+; Is there a way to do that without an unsafe/fast sqrt intrinsic call?

+; Also, although the goal for adding this test is to prove that we

+; don't crash, I have no idea what this code is doing, so I'm keeping

+; the full codegen checks in case there's motivation to improve this.

+define <2 x float> @PR31672() #0 {

+; X32-LABEL: PR31672:

+; X32: # BB#0:

+; X32-NEXT: pushl %ebp

+; X32-NEXT: movl %esp, %ebp

+; X32-NEXT: andl $-16, %esp

+; X32-NEXT: subl $80, %esp

+; X32-NEXT: xorps %xmm0, %xmm0

+; X32-NEXT: movaps {{.*#+}} xmm1 = <42,3,u,u>

+; X32-NEXT: movaps %xmm1, %xmm2

+; X32-NEXT: cmpeqps %xmm0, %xmm2

+; X32-NEXT: movaps %xmm2, {{[0-9]+}}(%esp)

+; X32-NEXT: movaps %xmm0, {{[0-9]+}}(%esp)

+; X32-NEXT: rsqrtps %xmm1, %xmm0

+; X32-NEXT: mulps %xmm0, %xmm1

+; X32-NEXT: addps {{\.LCPI.*}}, %xmm1

+; X32-NEXT: mulps {{\.LCPI.*}}, %xmm0

+; X32-NEXT: mulps %xmm1, %xmm0

+; X32-NEXT: movaps %xmm0, {{[0-9]+}}(%esp)

+; X32-NEXT: movl {{[0-9]+}}(%esp), %eax

+; X32-NEXT: movl {{[0-9]+}}(%esp), %ecx

+; X32-NEXT: andl %eax, %ecx

+; X32-NEXT: notl %eax

+; X32-NEXT: andl {{[0-9]+}}(%esp), %eax

+; X32-NEXT: orl %ecx, %eax

+; X32-NEXT: movl %eax, (%esp)

+; X32-NEXT: movl {{[0-9]+}}(%esp), %eax

+; X32-NEXT: movl {{[0-9]+}}(%esp), %ecx

+; X32-NEXT: movl {{[0-9]+}}(%esp), %edx

+; X32-NEXT: andl %ecx, %edx

+; X32-NEXT: notl %ecx

+; X32-NEXT: andl {{[0-9]+}}(%esp), %ecx

+; X32-NEXT: orl %edx, %ecx

+; X32-NEXT: movl %ecx, {{[0-9]+}}(%esp)

+; X32-NEXT: movl {{[0-9]+}}(%esp), %ecx

+; X32-NEXT: movl {{[0-9]+}}(%esp), %edx

+; X32-NEXT: andl %ecx, %edx

+; X32-NEXT: notl %ecx

+; X32-NEXT: andl {{[0-9]+}}(%esp), %ecx

+; X32-NEXT: orl %edx, %ecx

+; X32-NEXT: movl %ecx, {{[0-9]+}}(%esp)

+; X32-NEXT: movl {{[0-9]+}}(%esp), %ecx

+; X32-NEXT: andl %eax, %ecx

+; X32-NEXT: notl %eax

+; X32-NEXT: andl {{[0-9]+}}(%esp), %eax

+; X32-NEXT: orl %ecx, %eax

+; X32-NEXT: movl %eax, {{[0-9]+}}(%esp)

+; X32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero

+; X32-NEXT: movss {{.*#+}} xmm1 = mem[0],zero,zero,zero

+; X32-NEXT: unpcklps {{.*#+}} xmm1 = xmm1[0],xmm0[0],xmm1[1],xmm0[1]

+; X32-NEXT: movss {{.*#+}} xmm2 = mem[0],zero,zero,zero

+; X32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero

+; X32-NEXT: unpcklps {{.*#+}} xmm0 = xmm0[0],xmm2[0],xmm0[1],xmm2[1]

+; X32-NEXT: unpcklps {{.*#+}} xmm0 = xmm0[0],xmm1[0],xmm0[1],xmm1[1]

+; X32-NEXT: movl %ebp, %esp

+; X32-NEXT: popl %ebp

+; X32-NEXT: retl

+; X64-LABEL: PR31672:

+; X64: # BB#0:

+; X64-NEXT: xorps %xmm0, %xmm0

+; X64-NEXT: movaps %xmm0, -{{[0-9]+}}(%rsp)

+; X64-NEXT: movaps {{.*#+}} xmm1 = <42,3,u,u>

+; X64-NEXT: cmpeqps %xmm1, %xmm0

+; X64-NEXT: movaps %xmm0, -{{[0-9]+}}(%rsp)

+; X64-NEXT: rsqrtps %xmm1, %xmm0

+; X64-NEXT: mulps %xmm0, %xmm1

+; X64-NEXT: addps {{.*}}(%rip), %xmm1

+; X64-NEXT: mulps {{.*}}(%rip), %xmm0

+; X64-NEXT: mulps %xmm1, %xmm0

+; X64-NEXT: movaps %xmm0, -{{[0-9]+}}(%rsp)

+; X64-NEXT: movq -{{[0-9]+}}(%rsp), %r8

+; X64-NEXT: movq -{{[0-9]+}}(%rsp), %r9

+; X64-NEXT: movq -{{[0-9]+}}(%rsp), %r10

+; X64-NEXT: movq -{{[0-9]+}}(%rsp), %rdi

+; X64-NEXT: movl %r9d, %esi

+; X64-NEXT: andl %edi, %esi

+; X64-NEXT: movl %edi, %ecx

+; X64-NEXT: notl %ecx

+; X64-NEXT: movq -{{[0-9]+}}(%rsp), %rdx

+; X64-NEXT: movq -{{[0-9]+}}(%rsp), %rax

+; X64-NEXT: andl %eax, %ecx

+; X64-NEXT: orl %esi, %ecx

+; X64-NEXT: movl %ecx, -{{[0-9]+}}(%rsp)

+; X64-NEXT: movl %r8d, %ecx

+; X64-NEXT: andl %r10d, %ecx

+; X64-NEXT: movl %r10d, %esi

+; X64-NEXT: notl %esi

+; X64-NEXT: andl %edx, %esi

+; X64-NEXT: orl %ecx, %esi

+; X64-NEXT: movl %esi, -{{[0-9]+}}(%rsp)

+; X64-NEXT: shrq $32, %r9

+; X64-NEXT: shrq $32, %rdi

+; X64-NEXT: andl %edi, %r9d

+; X64-NEXT: notl %edi

+; X64-NEXT: shrq $32, %rax

+; X64-NEXT: andl %edi, %eax

+; X64-NEXT: orl %r9d, %eax

+; X64-NEXT: movl %eax, -{{[0-9]+}}(%rsp)

+; X64-NEXT: shrq $32, %r8

+; X64-NEXT: shrq $32, %r10

+; X64-NEXT: andl %r10d, %r8d

+; X64-NEXT: notl %r10d

+; X64-NEXT: shrq $32, %rdx

+; X64-NEXT: andl %r10d, %edx

+; X64-NEXT: orl %r8d, %edx

+; X64-NEXT: movl %edx, -{{[0-9]+}}(%rsp)

+; X64-NEXT: movss {{.*#+}} xmm1 = mem[0],zero,zero,zero

+; X64-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero

+; X64-NEXT: unpcklps {{.*#+}} xmm0 = xmm0[0],xmm1[0],xmm0[1],xmm1[1]

+; X64-NEXT: movss {{.*#+}} xmm1 = mem[0],zero,zero,zero

+; X64-NEXT: movss {{.*#+}} xmm2 = mem[0],zero,zero,zero

+; X64-NEXT: unpcklps {{.*#+}} xmm2 = xmm2[0],xmm1[0],xmm2[1],xmm1[1]

+; X64-NEXT: unpcklps {{.*#+}} xmm0 = xmm0[0],xmm2[0],xmm0[1],xmm2[1]

+; X64-NEXT: retq

+ %t0 = call fast <2 x float> @llvm.sqrt.v2f32(<2 x float> <float 42.0, float 3.0>)

+ ret <2 x float> %t0

+declare <2 x float> @llvm.sqrt.v2f32(<2 x float>) #1

+attributes #0 = { nounwind "unsafe-fp-math"="true" }

diff --git a/test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll b/test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll
index 5d510014a12a..a8fe6a9f6256 100644
--- a/test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll
+++ b/test/Instrumentation/AddressSanitizer/global_metadata_darwin.ll

@@ -16,18 +16,17 @@ target triple = "x86_64-apple-macosx10.11.0"

; Find the metadata for @global:

-; CHECK: [[METADATA:@.+]] = internal global {{.*}} @global {{.*}} section "__DATA,__asan_globals,regular", align 64

+; CHECK: [[METADATA:@.+]] = internal global {{.*}} @global {{.*}} section "__DATA,__asan_globals,regular"

; Find the liveness binder for @global and its metadata:

; CHECK: @__asan_binder_global = internal global {{.*}} @global {{.*}} [[METADATA]] {{.*}} section "__DATA,__asan_liveness,regular,live_support"

-; Test that there is the flag global variable:

-; CHECK: @__asan_globals_registered = common hidden global i64 0

; The binder has to be inserted to llvm.compiler.used to avoid being stripped

; during LTO.

; CHECK: @llvm.compiler.used {{.*}} @__asan_binder_global {{.*}} section "llvm.metadata"

+; Test that there is the flag global variable:

+; CHECK: @__asan_globals_registered = common hidden global i64 0

; Test that __asan_register_image_globals is invoked from the constructor:

; CHECK-LABEL: define internal void @asan.module_ctor

diff --git a/test/ThinLTO/X86/lazyload_metadata.ll b/test/ThinLTO/X86/lazyload_metadata.ll
index 7bd3e641bc77..bddabcdf9e72 100644
--- a/test/ThinLTO/X86/lazyload_metadata.ll
+++ b/test/ThinLTO/X86/lazyload_metadata.ll

@@ -11,19 +11,20 @@

; RUN: -o /dev/null -stats \

; RUN: 2>&1 | FileCheck %s -check-prefix=LAZY

; LAZY: 49 bitcode-reader - Number of Metadata records loaded

-; LAZY: 1 bitcode-reader - Number of MDStrings loaded

+; LAZY: 2 bitcode-reader - Number of MDStrings loaded

; RUN: llvm-lto -thinlto-action=import %t2.bc -thinlto-index=%t3.bc \

; RUN: -o /dev/null -disable-ondemand-mds-loading -stats \

; RUN: 2>&1 | FileCheck %s -check-prefix=NOTLAZY

; NOTLAZY: 58 bitcode-reader - Number of Metadata records loaded

-; NOTLAZY: 6 bitcode-reader - Number of MDStrings loaded

+; NOTLAZY: 7 bitcode-reader - Number of MDStrings loaded

target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"

target triple = "x86_64-apple-macosx10.11.0"

define void @globalfunc1(i32 %arg) {

+ %x = call i1 @llvm.type.test(i8* undef, metadata !"typeid1")

%tmp = add i32 %arg, 0, !metadata !2

ret void

}

@@ -34,6 +35,7 @@ define void @globalfunc1(i32 %arg) {

; These function are not imported and so we don't want to load their metadata.

define void @globalfunc2(i32 %arg) {

+ %x = call i1 @llvm.type.test(i8* undef, metadata !"typeid1")

%tmp = add i32 %arg, 0, !metadata !1

ret void

}

@@ -43,6 +45,8 @@ define void @globalfunc3(i32 %arg) {

ret void

}

+declare i1 @llvm.type.test(i8* %ptr, metadata %bitset) nounwind readnone

!1 = !{!2, !3, !4, !5, !6, !7, !8, !9}

!2 = !{!"Hello World"}

!3 = !{!"3"}

@@ -51,4 +55,4 @@ define void @globalfunc3(i32 %arg) {

!6 = !{!9}

!7 = !{!"7"}

!8 = !{!"8"}

-!9 = !{!6}

+!9 = !{!6} \ No newline at end of file

diff --git a/test/Transforms/NewGVN/pr31682.ll b/test/Transforms/NewGVN/pr31682.ll
new file mode 100644
index 000000000000..108e1e19afbd
--- /dev/null
+++ b/test/Transforms/NewGVN/pr31682.ll

@@ -0,0 +1,42 @@

+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py

+; RUN: opt < %s -basicaa -newgvn -S | FileCheck %s

+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"

+%struct.foo = type { i32, i32, [2 x [4 x [6 x [6 x i16]]]] }

+@global = external global %struct.foo*

+define void @bar() {

+; CHECK-LABEL: @bar(

+; CHECK-NEXT: bb:

+; CHECK-NEXT: [[TMP:%.*]] = load %struct.foo*, %struct.foo** @global

+; CHECK-NEXT: br label [[BB2:%.*]]

+; CHECK: bb2:

+; CHECK-NEXT: [[TMP4:%.*]] = getelementptr [[STRUCT_FOO:%.*]], %struct.foo* [[TMP]], i64 0, i32 1

+; CHECK-NEXT: br i1 undef, label [[BB2]], label [[BB7:%.*]]

+; CHECK: bb7:

+; CHECK-NEXT: br label [[BB10:%.*]]

+; CHECK: bb10:

+; CHECK-NEXT: br label [[BB10]]

+bb:

+ %tmp = load %struct.foo*, %struct.foo** @global

+ %tmp1 = getelementptr %struct.foo, %struct.foo* %tmp

+ br label %bb2

+bb2: ; preds = %bb2, %bb

+ %tmp3 = phi %struct.foo* [ undef, %bb ], [ %tmp6, %bb2 ]

+ %tmp4 = getelementptr %struct.foo, %struct.foo* %tmp3, i64 0, i32 1

+ %tmp5 = load i32, i32* %tmp4

+ %tmp6 = load %struct.foo*, %struct.foo** @global

+ br i1 undef, label %bb2, label %bb7

+bb7: ; preds = %bb2

+ %tmp8 = phi %struct.foo* [ %tmp6, %bb2 ]

+ %tmp9 = getelementptr %struct.foo, %struct.foo* %tmp8, i64 0, i32 1

+ br label %bb10

+bb10: ; preds = %bb10, %bb7

+ %tmp11 = load i32, i32* %tmp9

+ br label %bb10

diff --git a/test/tools/llvm-cxxfilt/invalid.test b/test/tools/llvm-cxxfilt/invalid.test
new file mode 100644
index 000000000000..10f3b2e81323
--- /dev/null
+++ b/test/tools/llvm-cxxfilt/invalid.test

@@ -0,0 +1,6 @@

+RUN: llvm-cxxfilt _Z1fi __Z1fi f ___ZSt1ff_block_invoke | FileCheck %s

+CHECK: f(int)

+CHECK-NEXT: __Z1fi

+CHECK-NEXT: f

+CHECK-NEXT: invocation function for block in std::f(float)