From a10a70238ace1093cad3adeb94814b422bd1b5c1 Mon Sep 17 00:00:00 2001
From: Teresa Johnson <tejohnson@google.com>
Date: Wed, 3 Jul 2019 02:14:47 +0000
Subject: [PATCH] [ThinLTO] Reenable test with workaround for known failure

Reenable the testing disabled in r364978 with the same workaround used
for this failure in the cfi-devirt.ll test. The known issue is PR39436,
and the workaround is to add -verify-machineinstrs=0.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@364997 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/ThinLTO/X86/devirt.ll | 79 +++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/test/ThinLTO/X86/devirt.ll b/test/ThinLTO/X86/devirt.ll
index 0d305321a71..4ea615ee35d 100644
--- a/test/ThinLTO/X86/devirt.ll
+++ b/test/ThinLTO/X86/devirt.ll
@@ -35,48 +35,49 @@
 
 ; TODO: Test index-based WPD one %t2.o once implemented.
 
-; TODO: Re-enable the below testing of the hybrid Thin/Regular LTO WPD, once expensive checks
-; failure is addressed.
-
 ; Legacy PM
-; RUN llvm-lto2 run %t.o -save-temps -pass-remarks=. \
-; RUN   -o %t3 \
-; RUN   -r=%t.o,test,px \
-; RUN   -r=%t.o,_ZN1A1nEi,p \
-; RUN   -r=%t.o,_ZN1B1fEi,p \
-; RUN   -r=%t.o,_ZN1C1fEi,p \
-; RUN   -r=%t.o,_ZN1D1mEi,p \
-; RUN   -r=%t.o,_ZTV1B, \
-; RUN   -r=%t.o,_ZTV1C, \
-; RUN   -r=%t.o,_ZTV1D, \
-; RUN   -r=%t.o,_ZN1A1nEi, \
-; RUN   -r=%t.o,_ZN1B1fEi, \
-; RUN   -r=%t.o,_ZN1C1fEi, \
-; RUN   -r=%t.o,_ZN1D1mEi, \
-; RUN   -r=%t.o,_ZTV1B,px \
-; RUN   -r=%t.o,_ZTV1C,px \
-; RUN   -r=%t.o,_ZTV1D,px 2>&1 | FileCheck %s --check-prefix=REMARK --dump-input=fail
-; RUN llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR
+; FIXME: Fix machine verifier issues and remove -verify-machineinstrs=0. PR39436.
+; RUN: llvm-lto2 run %t.o -save-temps -pass-remarks=. \
+; RUN:   -verify-machineinstrs=0 \
+; RUN:   -o %t3 \
+; RUN:   -r=%t.o,test,px \
+; RUN:   -r=%t.o,_ZN1A1nEi,p \
+; RUN:   -r=%t.o,_ZN1B1fEi,p \
+; RUN:   -r=%t.o,_ZN1C1fEi,p \
+; RUN:   -r=%t.o,_ZN1D1mEi,p \
+; RUN:   -r=%t.o,_ZTV1B, \
+; RUN:   -r=%t.o,_ZTV1C, \
+; RUN:   -r=%t.o,_ZTV1D, \
+; RUN:   -r=%t.o,_ZN1A1nEi, \
+; RUN:   -r=%t.o,_ZN1B1fEi, \
+; RUN:   -r=%t.o,_ZN1C1fEi, \
+; RUN:   -r=%t.o,_ZN1D1mEi, \
+; RUN:   -r=%t.o,_ZTV1B,px \
+; RUN:   -r=%t.o,_ZTV1C,px \
+; RUN:   -r=%t.o,_ZTV1D,px 2>&1 | FileCheck %s --check-prefix=REMARK --dump-input=fail
+; RUN: llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR
 
 ; New PM
-; RUN llvm-lto2 run %t.o -save-temps -use-new-pm -pass-remarks=. \
-; RUN   -o %t3 \
-; RUN   -r=%t.o,test,px \
-; RUN   -r=%t.o,_ZN1A1nEi,p \
-; RUN   -r=%t.o,_ZN1B1fEi,p \
-; RUN   -r=%t.o,_ZN1C1fEi,p \
-; RUN   -r=%t.o,_ZN1D1mEi,p \
-; RUN   -r=%t.o,_ZTV1B, \
-; RUN   -r=%t.o,_ZTV1C, \
-; RUN   -r=%t.o,_ZTV1D, \
-; RUN   -r=%t.o,_ZN1A1nEi, \
-; RUN   -r=%t.o,_ZN1B1fEi, \
-; RUN   -r=%t.o,_ZN1C1fEi, \
-; RUN   -r=%t.o,_ZN1D1mEi, \
-; RUN   -r=%t.o,_ZTV1B,px \
-; RUN   -r=%t.o,_ZTV1C,px \
-; RUN   -r=%t.o,_ZTV1D,px 2>&1 | FileCheck %s --check-prefix=REMARK --dump-input=fail
-; RUN llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR
+; FIXME: Fix machine verifier issues and remove -verify-machineinstrs=0. PR39436.
+; RUN: llvm-lto2 run %t.o -save-temps -use-new-pm -pass-remarks=. \
+; RUN:   -verify-machineinstrs=0 \
+; RUN:   -o %t3 \
+; RUN:   -r=%t.o,test,px \
+; RUN:   -r=%t.o,_ZN1A1nEi,p \
+; RUN:   -r=%t.o,_ZN1B1fEi,p \
+; RUN:   -r=%t.o,_ZN1C1fEi,p \
+; RUN:   -r=%t.o,_ZN1D1mEi,p \
+; RUN:   -r=%t.o,_ZTV1B, \
+; RUN:   -r=%t.o,_ZTV1C, \
+; RUN:   -r=%t.o,_ZTV1D, \
+; RUN:   -r=%t.o,_ZN1A1nEi, \
+; RUN:   -r=%t.o,_ZN1B1fEi, \
+; RUN:   -r=%t.o,_ZN1C1fEi, \
+; RUN:   -r=%t.o,_ZN1D1mEi, \
+; RUN:   -r=%t.o,_ZTV1B,px \
+; RUN:   -r=%t.o,_ZTV1C,px \
+; RUN:   -r=%t.o,_ZTV1D,px 2>&1 | FileCheck %s --check-prefix=REMARK --dump-input=fail
+; RUN: llvm-dis %t3.1.4.opt.bc -o - | FileCheck %s --check-prefix=CHECK-IR
 
 ; REMARK-DAG: single-impl: devirtualized a call to _ZN1A1nEi
 ; REMARK-DAG: single-impl: devirtualized a call to _ZN1D1mEi
-- 
2.40.0