From 2ce42a25d9732650cfac72211aa918e2fa82b8de Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 12 Apr 2023 13:22:53 -0400 Subject: Fix for crashes around FileCheck (#2793) * #include an absolute path didn't work - because paths were taken to always be relative. * Fix scoping issue for filecheck lib. * Small fix for file check issue. --- tools/slang-test/test-context.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'tools/slang-test/test-context.cpp') diff --git a/tools/slang-test/test-context.cpp b/tools/slang-test/test-context.cpp index 97c53679e..15b07444c 100644 --- a/tools/slang-test/test-context.cpp +++ b/tools/slang-test/test-context.cpp @@ -61,29 +61,22 @@ TestReporter* TestContext::getTestReporter() SlangResult TestContext::locateFileCheck() { - // TODO(JS): - // Hack for now, disabling IFileCheck, as appears to cause crashes. - -#if 0 DefaultSharedLibraryLoader* loader = DefaultSharedLibraryLoader::getSingleton(); - ComPtr library; - SLANG_RETURN_ON_FAIL(loader->loadSharedLibrary("slang-llvm", library.writeRef())); + + SLANG_RETURN_ON_FAIL(loader->loadSharedLibrary("slang-llvm", m_fileCheckLibrary.writeRef())); - if (!library) + if (!m_fileCheckLibrary) { return SLANG_FAIL; } using CreateFileCheckFunc = SlangResult (*)(const SlangUUID&, void**); - auto fn = reinterpret_cast(library->findFuncByName("createLLVMFileCheck_V1")); + auto fn = reinterpret_cast(m_fileCheckLibrary->findFuncByName("createLLVMFileCheck_V1")); if(!fn) { return SLANG_FAIL; } return fn(SLANG_IID_PPV_ARGS(m_fileCheck.writeRef())); -#else - return SLANG_FAIL; -#endif } Result TestContext::init(const char* inExePath) -- cgit v1.2.3