<div dir="ltr">I think these should be ASSERT_TRUE, though - since EXPECT doesn't halt execution of the test, so it'll hit UB on the following line where the pointer is dereferenced, etc?</div><br><div class="gmail_quote"><div dir="ltr">On Thu, Jun 15, 2017 at 3:31 PM Matthias Braun via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: matze<br>
Date: Thu Jun 15 17:31:08 2017<br>
New Revision: 305519<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=305519&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=305519&view=rev</a><br>
Log:<br>
UnitTests: Replace some if(x)report_fatal_error() with EXPECT_TRUE(!x)<br>
<br>
Modified:<br>
    llvm/trunk/unittests/MI/LiveIntervalTest.cpp<br>
    llvm/trunk/unittests/Target/AArch64/InstSizes.cpp<br>
<br>
Modified: llvm/trunk/unittests/MI/LiveIntervalTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MI/LiveIntervalTest.cpp?rev=305519&r1=305518&r2=305519&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/MI/LiveIntervalTest.cpp?rev=305519&r1=305518&r2=305519&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/MI/LiveIntervalTest.cpp (original)<br>
+++ llvm/trunk/unittests/MI/LiveIntervalTest.cpp Thu Jun 15 17:31:08 2017<br>
@@ -151,8 +151,7 @@ body: |<br>
   std::unique_ptr<MIRParser> MIR;<br>
   std::unique_ptr<Module> M = parseMIR(Context, PM, MIR, *TM, MIRString,<br>
                                        "func");<br>
-  if (!M)<br>
-    report_fatal_error("Could not parse MIR code\n");<br>
+  EXPECT_TRUE(M);<br>
<br>
   PM.add(new TestPass(T));<br>
<br>
<br>
Modified: llvm/trunk/unittests/Target/AArch64/InstSizes.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Target/AArch64/InstSizes.cpp?rev=305519&r1=305518&r2=305519&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Target/AArch64/InstSizes.cpp?rev=305519&r1=305518&r2=305519&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/Target/AArch64/InstSizes.cpp (original)<br>
+++ llvm/trunk/unittests/Target/AArch64/InstSizes.cpp Thu Jun 15 17:31:08 2017<br>
@@ -21,8 +21,7 @@ std::unique_ptr<TargetMachine> createTar<br>
<br>
   std::string Error;<br>
   const Target *TheTarget = TargetRegistry::lookupTarget(TT, Error);<br>
-  if (!TheTarget)<br>
-    report_fatal_error("Target not registered");<br>
+  EXPECT_TRUE(TheTarget);<br>
<br>
   return std::unique_ptr<TargetMachine>(<br>
       TheTarget->createTargetMachine(TT, CPU, FS, TargetOptions(), None,<br>
@@ -59,24 +58,20 @@ void runChecks(<br>
   std::unique_ptr<MemoryBuffer> MBuffer = MemoryBuffer::getMemBuffer(MIRString);<br>
   std::unique_ptr<MIRParser> MParser =<br>
       createMIRParser(std::move(MBuffer), Context);<br>
-  if (!MParser)<br>
-    report_fatal_error("Couldn't create MIR parser");<br>
+  EXPECT_TRUE(MParser);<br>
<br>
   std::unique_ptr<Module> M = MParser->parseIRModule();<br>
-  if (!M)<br>
-    report_fatal_error("Couldn't parse module");<br>
+  EXPECT_TRUE(M);<br>
<br>
   M->setTargetTriple(TM->getTargetTriple().getTriple());<br>
   M->setDataLayout(TM->createDataLayout());<br>
<br>
   MachineModuleInfo MMI(TM);<br>
   bool Res = MParser->parseMachineFunctions(*M, MMI);<br>
-  if (Res)<br>
-    report_fatal_error("Couldn't parse MIR functions");<br>
+  EXPECT_FALSE(Res);<br>
<br>
   auto F = M->getFunction("sizes");<br>
-  if (!F)<br>
-    report_fatal_error("Couldn't find intended function");<br>
+  EXPECT_TRUE(F);<br>
   auto &MF = MMI.getOrCreateMachineFunction(*F);<br>
<br>
   Checks(*II, MF);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>