gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring back old diag format.

Browse Source
This commit is contained in:
Axel Naumann 2014-10-16 11:20:04 +02:00 committed by sftnight
parent 61dbdbd506
commit 2243b3bfdb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Interpreter/IncrementalExecutor.cpp
View File

@ -262,7 +262,7 @@ IncrementalExecutor::executeFunction(llvm::StringRef funcname,
p2f.address = m_engine->getPointerToFunction(f);
// check if there is any unresolved symbol in the list
if (diagnoseUnresolvedSymbols(funcname))
if (diagnoseUnresolvedSymbols(funcname, "function"))
return kExeUnresolvedSymbols;
// Run the function
@ -432,11 +432,12 @@ IncrementalExecutor::getPointerToGlobalFromJIT(const llvm::GlobalValue& GV) {
// Function not yet codegened by the JIT, force this to happen now.
void* Ptr = m_engine->getPointerToGlobal(&GV);
diagnoseUnresolvedSymbols(GV.getName());
diagnoseUnresolvedSymbols(GV.getName(), "symbol");
return Ptr;
}
bool IncrementalExecutor::diagnoseUnresolvedSymbols(llvm::StringRef trigger) {
bool IncrementalExecutor::diagnoseUnresolvedSymbols(llvm::StringRef trigger,
llvm::StringRef title) {
if (m_unresolvedSymbols.empty())
return false;
@ -453,7 +454,13 @@ bool IncrementalExecutor::diagnoseUnresolvedSymbols(llvm::StringRef trigger) {
#endif
llvm::errs() << "IncrementalExecutor::executeFunction: symbol '" << *i
<< "' unresolved while linking " << trigger << "!\n";
<< "' unresolved while linking ";
if (!title.empty())
llvm::errs() << title << "'";
llvm::errs() << trigger;
if (!title.empty())
llvm::errs() << "'";
llvm::errs() << "!\n";
llvm::Function *ff = m_engine->FindFunctionNamed(i->c_str());
// i could also reference a global variable, in which case ff == 0.
if (ff)

3
lib/Interpreter/IncrementalExecutor.h
View File

@ -192,7 +192,8 @@ namespace cling {
///\brief Report and empty m_unresolvedSymbols.
///\return true if m_unresolvedSymbols was non-empty.
bool diagnoseUnresolvedSymbols(llvm::StringRef trigger);
bool diagnoseUnresolvedSymbols(llvm::StringRef trigger,
llvm::StringRef title = llvm::StringRef());
static void* HandleMissingFunction(const std::string&);
static void* NotifyLazyFunctionCreators(const std::string&);