[llvm] r371645 - Fix test failures after r371640

[Matt Arsenault via llvm-commits]

Author: arsenm
Date: Wed Sep 11 11:55:20 2019
New Revision: 371645

URL: http://llvm.org/viewvc/llvm-project?rev=371645&view=rev
Log:
Fix test failures after r371640

r371640 evidently fixed bug 39481

Modified:
    llvm/trunk/test/DebugInfo/WebAssembly/dbg-value-move-reg-stackify.mir
    llvm/trunk/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir

Modified: llvm/trunk/test/DebugInfo/WebAssembly/dbg-value-move-reg-stackify.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/WebAssembly/dbg-value-move-reg-stackify.mir?rev=371645&r1=371644&r2=371645&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/WebAssembly/dbg-value-move-reg-stackify.mir (original)
+++ llvm/trunk/test/DebugInfo/WebAssembly/dbg-value-move-reg-stackify.mir Wed Sep 11 11:55:20 2019
@@ -1,10 +1,10 @@
 # RUN: llc < %s -run-pass=wasm-reg-stackify -x=mir 2>&1 | FileCheck %s
 
 # CHECK: body:
-# CHECK: %1:i32 = I32_WRAP_I64 %0,
-# CHECK-NEXT: DBG_VALUE %1,
-# CHECK-NEXT: %1:i32 = CALL_i32 @bar,
-# CHECK-NEXT: DBG_VALUE %1,
+# CHECK: dead %3:i32 = I32_WRAP_I64 %0,
+# CHECK-NEXT: DBG_VALUE %1:i32
+# CHECK-NEXT: dead %2:i32 = CALL_i32 @bar,
+# CHECK-NEXT: DBG_VALUE %1:i32,
 # CHECK-NEXT: %[[NEWREG:.*]]:i32 = CALL_i32 @bar,
 # CHECK-NEXT: DBG_VALUE %[[NEWREG]],
 # CHECK-NEXT: CALL_VOID @foo, %[[NEWREG]],

Modified: llvm/trunk/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir?rev=371645&r1=371644&r2=371645&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir (original)
+++ llvm/trunk/test/DebugInfo/X86/live-debug-vars-discard-invalid.mir Wed Sep 11 11:55:20 2019
@@ -1,5 +1,4 @@
-# FIXME: Fix machine verifier issues and remove -verify-machineinstrs=0. PR39481.
-# RUN: llc -mtriple=x86_64-linux-gnu -start-before greedy -stop-after virtregrewriter -o - -verify-machineinstrs=0 %s | FileCheck %s
+# RUN: llc -mtriple=x86_64-linux-gnu -start-before greedy -stop-after virtregrewriter -o - -verify-machineinstrs %s | FileCheck %s
 
 --- |
   ; ModuleID = '<stdin>'
@@ -115,7 +114,7 @@ body:             |
 # CHECK-NEXT:   dead renamable $rcx = IMPLICIT_DEF
 # CHECK-NEXT:   dead renamable $rcx = IMPLICIT_DEF
 # CHECK-NEXT:   dead renamable $rcx = IMPLICIT_DEF
-# CHECK-NEXT:   DBG_VALUE $rcx, $noreg, !18, !DIExpression()
+# CHECK-NEXT:   DBG_VALUE $noreg, $noreg, !18, !DIExpression()
 
 # CHECK-LABEL: bb.3:
 # CHECK:        dead renamable $rcx = IMPLICIT_DEF