[llvm] r338975 - [ORC] Remove an incorrect use of 'cantFail'.

Shoaib Meenai via llvm-commits llvm-commits at lists.llvm.org
Mon Aug 20 13:39:33 PDT 2018


LLD uses a mix of assembly test cases (using llvm-mc) and YAML test cases (using yaml2obj).

From: llvm-commits <llvm-commits-bounces at lists.llvm.org> on behalf of David Blaikie via llvm-commits <llvm-commits at lists.llvm.org>
Reply-To: David Blaikie <dblaikie at gmail.com>
Date: Monday, August 20, 2018 at 1:06 PM
To: "lhamesATgmail.com" <lhames at gmail.com>
Cc: Commit Messages and Patches for LLVM <llvm-commits at lists.llvm.org>
Subject: Re: [llvm] r338975 - [ORC] Remove an incorrect use of 'cantFail'.


On Fri, Aug 17, 2018 at 12:43 PM Lang Hames <lhames at gmail.com<mailto:lhames at gmail.com>> wrote:
I think that once this functionality is exposed via lli/LLJIT it would be reasonable to have a regression test to verify that a bad object files trigger an error from the tool code.

So this is currently unreachable code? Could it remain an assertion, then, until it's added - so there's no chance of this slipping through untested? (this is generally the preferred approach in LLVM, I think - not adding unreachable/untestable code)

This will be a New Thing for JIT API testing though: MCJIT and ORCv1 both notionally deal with bad object files, but never had tests for them. I assume it was just an aversion to checking in binary object-files for tests, but in this case we could just test with an empty object file.

There are a few projects/areas of LLVM that contend with that htese days - for instance I think lld's approach is to rely on llvm-mc to assemble assembly-written test cases into object files to then pass into the linker for testing. Other areas (like llvm-dwarfdump) have some checked in binary object files. I'm  undecided on the best approach here - certainly open to throwing around more ideas in that space.

- Dave


-- Lang.

On Thu, Aug 16, 2018 at 2:19 PM David Blaikie <dblaikie at gmail.com<mailto:dblaikie at gmail.com>> wrote:

On Thu, Aug 16, 2018 at 11:37 AM Lang Hames <lhames at gmail.com<mailto:lhames at gmail.com>> wrote:
I'm not sure this particular case deserves a test case. Prior to the change, passing a valid object was a matter of contract.

Seems to me a test case demonstrating that the program behaves as expected when an invalid object is passed, now that that's a valid use-case is merited. Usual sort of LLVM test approach.

Whether it's a unit test or an end-to-end test I don't have strong feelings about.

After the change it is a trivial error-propagation, and we don't usually test them at every level of the stack.

I would like to see more "bad object" tests for libObject itself, but that's outside the scope of this patch.

-- Lang.

On Mon, Aug 6, 2018 at 8:47 PM David Blaikie <dblaikie at gmail.com<mailto:dblaikie at gmail.com>> wrote:
Test case?

On Sun, Aug 5, 2018 at 4:55 PM Lang Hames via llvm-commits <llvm-commits at lists.llvm.org<mailto:llvm-commits at lists.llvm.org>> wrote:
Author: lhames
Date: Sun Aug  5 16:55:35 2018
New Revision: 338975

URL: http://llvm.org/viewvc/llvm-project?rev=338975&view=rev<https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D338975-26view-3Drev&d=DwMFaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=A5jpUMBMrLqfc2BgsKejO-Ax_SIzu6atc0sVTEXzL9I&s=lqa9zdklyH9I4i9I9bnpOHwdRI0U3BURIT6khgRrfNw&e=>
Log:
[ORC] Remove an incorrect use of 'cantFail'.

This code was moved out from BasicObjectLayerMaterializationUnit, which required
the supplied object to be well formed. The getObjectSymbolFlags function does
not require a well-formed object, so we have to propagate the error here.

Modified:
    llvm/trunk/lib/ExecutionEngine/Orc/Layer.cpp

Modified: llvm/trunk/lib/ExecutionEngine/Orc/Layer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/Layer.cpp?rev=338975&r1=338974&r2=338975&view=diff<https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_llvm_trunk_lib_ExecutionEngine_Orc_Layer.cpp-3Frev-3D338975-26r1-3D338974-26r2-3D338975-26view-3Ddiff&d=DwMFaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=A5jpUMBMrLqfc2BgsKejO-Ax_SIzu6atc0sVTEXzL9I&s=TZoBRRi_6KJ5MjqLdpL5CSHBxgfrPJVab8-gbwqmnwA&e=>
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Orc/Layer.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Orc/Layer.cpp Sun Aug  5 16:55:35 2018
@@ -116,8 +116,10 @@ Expected<SymbolFlagsMap> getObjectSymbol
   for (auto &Sym : (*Obj)->symbols()) {
     if (!(Sym.getFlags() & object::BasicSymbolRef::SF_Undefined) &&
         (Sym.getFlags() & object::BasicSymbolRef::SF_Exported)) {
-      auto InternedName =
-          ES.getSymbolStringPool().intern(cantFail(Sym.getName()));
+      auto Name = Sym.getName();
+      if (!Name)
+        return Name.takeError();
+      auto InternedName = ES.getSymbolStringPool().intern(*Name);
       auto SymFlags = JITSymbolFlags::fromObjectSymbol(Sym);
       if (!SymFlags)
         return SymFlags.takeError();


_______________________________________________
llvm-commits mailing list
llvm-commits at lists.llvm.org<mailto:llvm-commits at lists.llvm.org>
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits<https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.llvm.org_cgi-2Dbin_mailman_listinfo_llvm-2Dcommits&d=DwMFaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=o3kDXzdBUE3ljQXKeTWOMw&m=A5jpUMBMrLqfc2BgsKejO-Ax_SIzu6atc0sVTEXzL9I&s=q9RRbZi9bLl2b-mZnpFl0vG1ET8Mj8i2Mlwq6S6Uyew&e=>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180820/4e023c2a/attachment.html>


More information about the llvm-commits mailing list