Skip to content

[cling] Resolve some of the test failures on osx #13296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hahnjo merged 2 commits into from
Dec 5, 2023
Merged

[cling] Resolve some of the test failures on osx #13296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9e0b0f
[cling] Handle llvm::Errors correctly.
vgvassilev Jul 21, 2023
35d79f4
[cling] Correctly infer the SDKROOT.
vgvassilev Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion interpreter/cling/lib/Interpreter/DynamicLibraryManagerSymbol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,9 +1141,13 @@ namespace cling {

auto ObjF = llvm::object::ObjectFile::createObjectFile(FileName);
if (!ObjF) {
std::string Message;
handleAllErrors(ObjF.takeError(), [&](llvm::ErrorInfoBase &EIB) {
Message += EIB.message() + "; ";
});
if (DEBUG > 1)
cling::errs() << "[DyLD] Failed to read object file "
<< FileName << "\n";
<< FileName << ". Message: '" << Message << "\n";
return true;
}

Expand Down
6 changes: 4 additions & 2 deletions interpreter/cling/lib/Interpreter/IncrementalJIT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,10 @@ class DelegateGenerator : public DefinitionGenerator {
const SymbolLookupSet& LookupSet) override {
SymbolMap Symbols;
for (auto& KV : LookupSet) {
if (auto Addr = lookup(*KV.first))
Symbols[KV.first] = Addr.get();
auto Addr = lookup(*KV.first);
if (auto Err = Addr.takeError())
return Err;
Symbols[KV.first] = Addr.get();
}
if (Symbols.empty())
return Error::success();
Expand Down
3 changes: 2 additions & 1 deletion interpreter/cling/test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ llvm_config.with_system_environment(

config.substitutions.append(('%PATH%', config.environment['PATH']))


# We want to invoke the system clang. Or not?
config.substitutions = [x for x in config.substitutions if x[0] != ' clang ']

Expand Down Expand Up @@ -109,6 +108,8 @@ config.substitutions.append(('%shlibext', config.shlibext))
if platform.system() not in ['Windows'] or lit_config.getBashPath() != '':
config.available_features.add('shell')

lit.util.usePlatformSdkOnDarwin(config, lit_config)

# ROOT adds features that "heal" some of cling's tests; need to detect
# vanilla vs cling-as-part-of-ROOT. The latter has no `lib/UserInterface/textinput/`:
if os.path.isdir(os.path.join(config.cling_src_root, 'lib', 'UserInterface', 'textinput')):
Expand Down