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

Misc renamings and type changes

Browse Source
This commit is contained in:
Jonas Hahnfeld 2023-07-10 08:52:15 +02:00 committed by jenkins
parent 1144ecf217
commit fae810094c
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/cling/Interpreter/Exception.h
View File

@ -65,7 +65,7 @@ namespace cling {
// Yes, throwing exceptions in error handlers is bad. // Yes, throwing exceptions in error handlers is bad.
// Doing nothing is pretty terrible, too. // Doing nothing is pretty terrible, too.
static void throwingHandler(void * /*user_data*/, static void throwingHandler(void * /*user_data*/,
const std::string& reason, const char* reason,
bool /*gen_crash_diag*/); bool /*gen_crash_diag*/);
}; };
} // end namespace cling } // end namespace cling

2
lib/Interpreter/DynamicLibraryManagerSymbol.cpp
View File

@ -384,7 +384,7 @@ std::string cached_realpath(llvm::StringRef path, llvm::StringRef base_path = ""
if (S_ISLNK(st_mode)) { if (S_ISLNK(st_mode)) {
llvm::StringRef symlink = cached_readlink(result.c_str()); llvm::StringRef symlink = cached_readlink(result.c_str());
if (llvm::sys::path::is_relative(symlink)) { if (llvm::sys::path::is_relative(symlink)) {
result.set_size(old_size); result.resize(old_size);
result = cached_realpath(symlink, result, true, symlooplevel - 1); result = cached_realpath(symlink, result, true, symlooplevel - 1);
} else { } else {
result = cached_realpath(symlink, "", true, symlooplevel - 1); result = cached_realpath(symlink, "", true, symlooplevel - 1);

2
lib/Interpreter/DynamicLookup.cpp
View File

@ -814,7 +814,7 @@ namespace cling {
ArrayType::Normal, ArrayType::Normal,
/*IndexTypeQuals=*/0); /*IndexTypeQuals=*/0);
StringLiteral::StringKind Kind = StringLiteral::Ascii; StringLiteral::StringKind Kind = StringLiteral::Ordinary;
Expr* Result = StringLiteral::Create(*m_Context, Expr* Result = StringLiteral::Create(*m_Context,
Value, Value,
Kind, Kind,

2
lib/Interpreter/Exception.cpp
View File

@ -110,7 +110,7 @@ namespace cling {
CompilationException::~CompilationException() noexcept {} CompilationException::~CompilationException() noexcept {}
void CompilationException::throwingHandler(void * /*user_data*/, void CompilationException::throwingHandler(void * /*user_data*/,
const std::string& reason, const char* reason,
bool /*gen_crash_diag*/) { bool /*gen_crash_diag*/) {
// See https://github.com/root-project/root/issues/7541 and // See https://github.com/root-project/root/issues/7541 and
// https://bugs.llvm.org/show_bug.cgi?id=49692 : // https://bugs.llvm.org/show_bug.cgi?id=49692 :

2
lib/Interpreter/ForwardDeclPrinter.cpp
View File

@ -1149,7 +1149,7 @@ namespace cling {
VISIT_DECL(Pointer, getPointeeType); VISIT_DECL(Pointer, getPointeeType);
VISIT_DECL(LValueReference, getPointeeType); VISIT_DECL(LValueReference, getPointeeType);
VISIT_DECL(RValueReference, getPointeeType); VISIT_DECL(RValueReference, getPointeeType);
VISIT_DECL(TypeOf, getUnderlyingType); VISIT_DECL(TypeOf, getUnmodifiedType);
VISIT_DECL(Elaborated, getNamedType); VISIT_DECL(Elaborated, getNamedType);
VISIT_DECL(UnaryTransform, getUnderlyingType); VISIT_DECL(UnaryTransform, getUnderlyingType);
#undef VISIT_DECL #undef VISIT_DECL

2
lib/Interpreter/ForwardDeclPrinter.h
View File

@ -107,7 +107,7 @@ namespace cling {
llvm::DenseMap<const clang::Decl*, bool> m_Visited; // fwd decl success llvm::DenseMap<const clang::Decl*, bool> m_Visited; // fwd decl success
std::stack<llvm::raw_ostream*> m_StreamStack; std::stack<llvm::raw_ostream*> m_StreamStack;
std::set<const char*> m_BuiltinNames; std::set<llvm::StringRef> m_BuiltinNames;
IgnoreFilesFunc_t m_IgnoreFile; // Call back to ignore some top level files. IgnoreFilesFunc_t m_IgnoreFile; // Call back to ignore some top level files.
void printTypedefOrAliasDecl(clang::TypedefNameDecl* D); void printTypedefOrAliasDecl(clang::TypedefNameDecl* D);

2
lib/Interpreter/Interpreter.cpp
View File

@ -1841,7 +1841,7 @@ namespace cling {
}(); }();
if (!ret.isValid()) { if (!ret.isValid()) {
std::string msg = "Error evaluating expression "; std::string msg = "Error evaluating expression ";
CompilationException::throwingHandler(nullptr, msg + DEI->getExpr(), CompilationException::throwingHandler(nullptr, (msg + DEI->getExpr()).c_str(),
false /*backtrace*/); false /*backtrace*/);
} }
return ret; return ret;

4
test/lit.site.cfg.in
View File

@ -5,8 +5,8 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@"
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
config.cling_src_root = "@CLING_SOURCE_DIR@" config.cling_src_root = "@CLING_SOURCE_DIR@"
config.cling_obj_root = "@CLING_BINARY_DIR@" config.cling_obj_root = "@CLING_BINARY_DIR@"
config.target_triple = "@TARGET_TRIPLE@" config.target_triple = "@LLVM_TARGET_TRIPLE@"
config.host_triple = "@TARGET_TRIPLE@" config.host_triple = "@LLVM_TARGET_TRIPLE@"
config.shlibext = "@TARGET_SHLIBEXT@" config.shlibext = "@TARGET_SHLIBEXT@"
config.cxx_standard = "@CMAKE_CXX_STANDARD@" config.cxx_standard = "@CMAKE_CXX_STANDARD@"