[NFC][test] replace empty returns with GTEST_SKIP

[supergrecko]

Summary

Now that gtest has been updated to 1.10 which supports GTEST_SKIP, we can use that over return;

This patch replaces returns with GTEST_SKIP for the todo listings added in https://reviews.llvm.org/rGd122d80b3d1c3ffdfbf6a2168f3d61fa4337facc

[lhames]

LGTM, pending acceptance of https://reviews.llvm.org/D102694.

[ikudrin]

GTEST_SKIP() may be called in OrcCAPITestBase::SetUp() so that checks can be removed in every separate test.

[supergrecko]

[NFC][test] replace if clauses in all tests with GTEST_SKIP() in SetUp

[supergrecko]

In D102710#2767524, @ikudrin wrote:

GTEST_SKIP() may be called in OrcCAPITestBase::SetUp() so that checks can be removed in every separate test.

That also works, thank you for the suggestion. I've updated the revision accordingly.

[ikudrin]

LGTM, thanks!

[supergrecko]

I do not have commit access so it'd be great if somebody could land this on my behalf.

[lhames]

In D102710#2773286, @supergrecko wrote:

I do not have commit access so it'd be great if somebody could land this on my behalf.

Done. Thanks for the patch! :)

llvm/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp

static void SetUpTestCase() {
     }
 
     LLVMOrcDisposeLLJIT(J);
     TargetSupported = true;
   }
 
   void SetUp() override {
     if (!TargetSupported)
-      return;
+      GTEST_SKIP();
 
     LLVMOrcJITTargetMachineBuilderRef JTMB = nullptr;
     LLVMErrorRef E1 = LLVMOrcJITTargetMachineBuilderDetectHost(&JTMB);
     assert(E1 == LLVMErrorSuccess && "Expected call to detect host to succeed");
     (void)E1;
 
     LLVMOrcLLJITBuilderRef Builder = LLVMOrcCreateLLJITBuilder();
     LLVMOrcLLJITBuilderSetJITTargetMachineBuilder(Builder, JTMB);

 static std::string toString(LLVMErrorRef E) {
   char *ErrMsg = LLVMGetErrorMessage(E);
   std::string Result(ErrMsg);
   LLVMDisposeErrorMessage(ErrMsg);
   return Result;
 }
 
 TEST_F(OrcCAPITestBase, SymbolStringPoolUniquing) {
-  if (!Jit) {
-    // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
-    return;
-  }
-
   LLVMOrcSymbolStringPoolEntryRef E1 =
       LLVMOrcExecutionSessionIntern(ExecutionSession, "aaa");
   LLVMOrcSymbolStringPoolEntryRef E2 =
       LLVMOrcExecutionSessionIntern(ExecutionSession, "aaa");
   LLVMOrcSymbolStringPoolEntryRef E3 =
       LLVMOrcExecutionSessionIntern(ExecutionSession, "bbb");
   const char *SymbolName = LLVMOrcSymbolStringPoolEntryStr(E1);
   ASSERT_EQ(E1, E2) << "String pool entries are not unique";
   ASSERT_NE(E1, E3) << "Unique symbol pool entries are equal";
   ASSERT_STREQ("aaa", SymbolName) << "String value of symbol is not equal";
   LLVMOrcReleaseSymbolStringPoolEntry(E1);
   LLVMOrcReleaseSymbolStringPoolEntry(E2);
   LLVMOrcReleaseSymbolStringPoolEntry(E3);
 }
 
 TEST_F(OrcCAPITestBase, JITDylibLookup) {
-  if (!Jit) {
-    // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
-    return;
-  }
   LLVMOrcJITDylibRef DoesNotExist =
       LLVMOrcExecutionSessionGetJITDylibByName(ExecutionSession, "test");
   ASSERT_FALSE(!!DoesNotExist);
   LLVMOrcJITDylibRef L1 =
       LLVMOrcExecutionSessionCreateBareJITDylib(ExecutionSession, "test");
   LLVMOrcJITDylibRef L2 =
       LLVMOrcExecutionSessionGetJITDylibByName(ExecutionSession, "test");
   ASSERT_EQ(L1, L2) << "Located JIT Dylib is not equal to original";
 }
 
 TEST_F(OrcCAPITestBase, MaterializationUnitCreation) {
-  if (!Jit) {
-    // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
-    return;
-  }
-
   LLVMOrcSymbolStringPoolEntryRef Name =
       LLVMOrcLLJITMangleAndIntern(Jit, "test");
   LLVMJITSymbolFlags Flags = {LLVMJITSymbolGenericFlagsWeak, 0};
   LLVMOrcJITTargetAddress Addr =
       (LLVMOrcJITTargetAddress)(&materializationUnitFn);
   LLVMJITEvaluatedSymbol Sym = {Addr, Flags};
   LLVMJITCSymbolMapPair Pair = {Name, Sym};
   LLVMJITCSymbolMapPair Pairs[] = {Pair};
   LLVMOrcMaterializationUnitRef MU = LLVMOrcAbsoluteSymbols(Pairs, 1);
   LLVMOrcJITDylibDefine(MainDylib, MU);
   LLVMOrcJITTargetAddress OutAddr;
   if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &OutAddr, "test"))
     FAIL() << "Failed to look up \"test\" symbol (triple = " << TargetTriple
            << "): " << toString(E);
   ASSERT_EQ(Addr, OutAddr);
 }
 
 TEST_F(OrcCAPITestBase, DefinitionGenerators) {
-  if (!Jit) {
-    // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
-    return;
-  }
-
   LLVMOrcDefinitionGeneratorRef Gen =
       LLVMOrcCreateCustomCAPIDefinitionGenerator(&definitionGeneratorFn,
                                                  nullptr);
   LLVMOrcJITDylibAddGenerator(MainDylib, Gen);
   LLVMOrcJITTargetAddress OutAddr;
   if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &OutAddr, "test"))
     FAIL() << "The DefinitionGenerator did not create symbol \"test\" "
            << "(triple = " << TargetTriple << "): " << toString(E);
   LLVMOrcJITTargetAddress ExpectedAddr =
       (LLVMOrcJITTargetAddress)(&materializationUnitFn);
   ASSERT_EQ(ExpectedAddr, OutAddr);
 }
 
 TEST_F(OrcCAPITestBase, ResourceTrackerDefinitionLifetime) {
-  if (!Jit) {
-    // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
-    return;
-  }
-
   // This test case ensures that all symbols loaded into a JITDylib with a
   // ResourceTracker attached are cleared from the JITDylib once the RT is
   // removed.
   LLVMOrcResourceTrackerRef RT =
       LLVMOrcJITDylibCreateResourceTracker(MainDylib);
   LLVMOrcThreadSafeModuleRef TSM = createTestModule(SumExample, "sum.ll");
   if (LLVMErrorRef E = LLVMOrcLLJITAddLLVMIRModuleWithRT(Jit, RT, TSM))
     FAIL() << "Failed to add LLVM IR module to LLJIT (triple = " << TargetTriple
TEST_F(OrcCAPITestBase, ResourceTrackerDefinitionLifetime) {
   ASSERT_TRUE(Err);
   LLVMConsumeError(Err);
 
   ASSERT_FALSE(OutAddr);
   LLVMOrcReleaseResourceTracker(RT);
 }
 
 TEST_F(OrcCAPITestBase, ResourceTrackerTransfer) {
-  if (!Jit) {
-    // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
-    return;
-  }
-
   LLVMOrcResourceTrackerRef DefaultRT =
       LLVMOrcJITDylibGetDefaultResourceTracker(MainDylib);
   LLVMOrcResourceTrackerRef RT2 =
       LLVMOrcJITDylibCreateResourceTracker(MainDylib);
   LLVMOrcThreadSafeModuleRef TSM = createTestModule(SumExample, "sum.ll");
   if (LLVMErrorRef E = LLVMOrcLLJITAddLLVMIRModuleWithRT(Jit, DefaultRT, TSM))
     FAIL() << "Failed to add LLVM IR module to LLJIT (triple = " << TargetTriple
            << "): " << toString(E);
   LLVMOrcJITTargetAddress Addr;
   if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &Addr, "sum"))
     FAIL() << "Symbol \"sum\" was not added into JIT (triple = " << TargetTriple
            << "): " << toString(E);
   LLVMOrcResourceTrackerTransferTo(DefaultRT, RT2);
   LLVMErrorRef Err = LLVMOrcLLJITLookup(Jit, &Addr, "sum");
   ASSERT_FALSE(Err);
   LLVMOrcReleaseResourceTracker(RT2);
 }
 
 TEST_F(OrcCAPITestBase, AddObjectBuffer) {
-  if (!Jit) {
-    // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
-    return;
-  }
-
   LLVMOrcObjectLayerRef ObjLinkingLayer = LLVMOrcLLJITGetObjLinkingLayer(Jit);
   LLVMMemoryBufferRef ObjBuffer = createTestObject(SumExample, "sum.ll");
 
   if (LLVMErrorRef E = LLVMOrcObjectLayerAddObjectFile(ObjLinkingLayer,
                                                        MainDylib, ObjBuffer))
     FAIL() << "Failed to add object file to ObjLinkingLayer (triple = "
            << TargetTriple << "): " << toString(E);
 
   LLVMOrcJITTargetAddress SumAddr;
   if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &SumAddr, "sum"))
     FAIL() << "Symbol \"sum\" was not added into JIT (triple = " << TargetTriple
            << "): " << toString(E);
   ASSERT_TRUE(!!SumAddr);
 }
 
 TEST_F(OrcCAPITestBase, ExecutionTest) {
-  if (!Jit) {
-    // TODO: Use GTEST_SKIP() when GTest is updated to version 1.10.0
-    return;
-  }
-
   using SumFunctionType = int32_t (*)(int32_t, int32_t);
 
   // This test performs OrcJIT compilation of a simple sum module
   LLVMInitializeNativeAsmPrinter();
   LLVMOrcThreadSafeModuleRef TSM = createTestModule(SumExample, "sum.ll");
   if (LLVMErrorRef E = LLVMOrcLLJITAddLLVMIRModule(Jit, MainDylib, TSM))
     FAIL() << "Failed to add LLVM IR module to LLJIT (triple = " << TargetTriple
            << ")" << toString(E);
   LLVMOrcJITTargetAddress TestFnAddr;
   if (LLVMErrorRef E = LLVMOrcLLJITLookup(Jit, &TestFnAddr, "sum"))
     FAIL() << "Symbol \"sum\" was not added into JIT (triple = " << TargetTriple
            << "): " << toString(E);
   auto *SumFn = (SumFunctionType)(TestFnAddr);
   int32_t Result = SumFn(1, 1);
   ASSERT_EQ(2, Result);
 }