admin/lifting-bits-remill
1
0
Fork 0
mirror of https://github.com/lifting-bits/remill synced 2026-06-21 13:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

removes ambigous utility function (#593)

Browse Source
This commit is contained in:
2over12
2022-05-11 12:54:06 -04:00
committed by GitHub
parent f56c2dd36a
commit 3cf6d41d6f
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/remill/BC/Util.h
-5
View File
@@ -153,11 +153,6 @@ bool VerifyModule(llvm::Module *module);
// Returns diagnostic message if verify failed.
std::optional<std::string> VerifyModuleMsg(llvm::Module *module);
// Parses and loads a bitcode file into memory.
std::unique_ptr<llvm::Module>
LoadModuleFromFile(llvm::LLVMContext *context,
std::string_view file_name,
bool allow_failure = false) __attribute__((__deprecated__));
std::unique_ptr<llvm::Module> LoadModuleFromFile(llvm::LLVMContext *context,
std::filesystem::path file_name);
lib/BC/Util.cpp
+8 -18
View File
@@ -426,38 +426,28 @@ bool VerifyModule(llvm::Module *module) {
}
std::unique_ptr<llvm::Module> LoadModuleFromFile(llvm::LLVMContext *context,
std::filesystem::path path)
std::filesystem::path file_name)
{
// NOTE(lukas): Calling deprecated function, once it is remove its body
// will be more or less inlined.
return LoadModuleFromFile(context, path.string(), true);
}
// Reads an LLVM module from a file.
std::unique_ptr<llvm::Module> LoadModuleFromFile(llvm::LLVMContext *context,
std::string_view file_name_,
bool allow_failure) {
llvm::SMDiagnostic err;
llvm::StringRef file_name(file_name_.data(), file_name_.size());
auto module = llvm::parseIRFile(file_name, err, *context);
auto module = llvm::parseIRFile(file_name.string(), err, *context);
if (!module) {
LOG_IF(FATAL, !allow_failure)
<< "Unable to parse module file " << file_name_ << ": "
LOG(ERROR)
<< "Unable to parse module file " << file_name << ": "
<< err.getMessage().str();
return {};
}
auto ec = module->materializeAll(); // Just in case.
if (ec) {
LOG_IF(FATAL, !allow_failure)
<< "Unable to materialize everything from " << file_name_;
LOG(ERROR)
<< "Unable to materialize everything from " << file_name;
return {};
}
if (!VerifyModule(module.get())) {
LOG_IF(FATAL, !allow_failure)
<< "Error verifying module read from file " << file_name_;
LOG(ERROR)
<< "Error verifying module read from file " << file_name;
return {};
}