[PATCH] D20371: [llc] Remove exit-on-error flag from MIR tests (PR27770)

[Diana Picus via llvm-commits]

rovka created this revision.
rovka added a reviewer: arphaman.
rovka added subscribers: llvm-commits, rengolin.
Herald added a subscriber: qcolombet.

This is made possible by removing an assert in llc that assumed MIRParser::parseLLVMModule would exit on error. MIRParser's documentation states that it returns null if a parsing error occurs, so there's no reason to assert. We can instead just fall through to where the check for a module is performed and exit if it is null.

This commit is part of the clean-up after r269655.

Fixes PR27770

http://reviews.llvm.org/D20371

Files:
  test/CodeGen/MIR/Generic/invalid-jump-table-kind.mir
  test/CodeGen/MIR/Generic/llvm-ir-error-reported.mir
  test/CodeGen/MIR/Generic/machine-function-missing-function.mir
  test/CodeGen/MIR/Generic/machine-function-missing-name.mir
  test/CodeGen/MIR/Generic/machine-function-redefinition-error.mir
  test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir
  test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir
  test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir
  tools/llc/llc.cpp

Index: tools/llc/llc.cpp
===================================================================
--- tools/llc/llc.cpp
+++ tools/llc/llc.cpp
@@ -260,10 +260,8 @@
   if (!SkipModule) {
     if (StringRef(InputFilename).endswith_lower(".mir")) {
       MIR = createMIRParserFromFile(InputFilename, Err, Context);
-      if (MIR) {
+      if (MIR)
         M = MIR->parseLLVMModule();
-        assert(M && "parseLLVMModule should exit on failure");
-      }
     } else
       M = parseIRFile(InputFilename, Err, Context);
     if (!M) {
Index: test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir
===================================================================
--- test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir
+++ test/CodeGen/MIR/X86/variable-sized-stack-object-size-error.mir
@@ -1,4 +1,4 @@
-# RUN: not llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -exit-on-error -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: not llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
 --- |
 
   define i32 @test(i32 %a) {
Index: test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir
===================================================================
--- test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir
+++ test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-immutable.mir
@@ -1,4 +1,4 @@
-# RUN: not llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -exit-on-error -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: not llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
 
 --- |
 
Index: test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir
===================================================================
--- test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir
+++ test/CodeGen/MIR/X86/spill-slot-fixed-stack-object-aliased.mir
@@ -1,4 +1,4 @@
-# RUN: not llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -exit-on-error -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: not llc -march=x86-64 -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
 
 --- |
 
Index: test/CodeGen/MIR/Generic/machine-function-redefinition-error.mir
===================================================================
--- test/CodeGen/MIR/Generic/machine-function-redefinition-error.mir
+++ test/CodeGen/MIR/Generic/machine-function-redefinition-error.mir
@@ -1,4 +1,4 @@
-# RUN: not llc -start-after branch-folder -stop-after branch-folder -exit-on-error -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: not llc -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
 # This test ensures that the machine function errors are reported correctly.
 
 ---
Index: test/CodeGen/MIR/Generic/machine-function-missing-name.mir
===================================================================
--- test/CodeGen/MIR/Generic/machine-function-missing-name.mir
+++ test/CodeGen/MIR/Generic/machine-function-missing-name.mir
@@ -1,4 +1,4 @@
-# RUN: not llc -start-after branch-folder -stop-after branch-folder -exit-on-error -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: not llc -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
 # This test ensures that an error is reported when a machine function doesn't
 # have a name attribute.
 
Index: test/CodeGen/MIR/Generic/machine-function-missing-function.mir
===================================================================
--- test/CodeGen/MIR/Generic/machine-function-missing-function.mir
+++ test/CodeGen/MIR/Generic/machine-function-missing-function.mir
@@ -1,4 +1,4 @@
-# RUN: not llc -start-after branch-folder -stop-after branch-folder -exit-on-error -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: not llc -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
 # This test ensures that an error is reported when the mir file has LLVM IR and
 # one of the machine functions has a name that doesn't match any function in
 # the LLVM IR.
Index: test/CodeGen/MIR/Generic/llvm-ir-error-reported.mir
===================================================================
--- test/CodeGen/MIR/Generic/llvm-ir-error-reported.mir
+++ test/CodeGen/MIR/Generic/llvm-ir-error-reported.mir
@@ -1,4 +1,4 @@
-# RUN: not llc -start-after branch-folder -stop-after branch-folder -exit-on-error -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: not llc -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
 # This test ensures an error is reported if the embedded LLVM IR contains an
 # error.
 
Index: test/CodeGen/MIR/Generic/invalid-jump-table-kind.mir
===================================================================
--- test/CodeGen/MIR/Generic/invalid-jump-table-kind.mir
+++ test/CodeGen/MIR/Generic/invalid-jump-table-kind.mir
@@ -1,4 +1,4 @@
-# RUN: not llc -start-after branch-folder -stop-after branch-folder -exit-on-error -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: not llc -start-after branch-folder -stop-after branch-folder -o /dev/null %s 2>&1 | FileCheck %s
 
 --- |
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20371.57629.patch
Type: text/x-patch
Size: 5188 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160518/78962cf7/attachment.bin>