RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 10:32:48 +02:00
Code Issues Projects Releases Wiki Activity

Modernize the error handling of the Materialize function.

Browse Source 
llvm-svn: 220600
This commit is contained in:
Rafael Espindola 2014-10-24 22:50:48 +00:00
parent 9e33867d25
commit ee06e286d8
12 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/IR/GVMaterializer.h
View File

@ -38,7 +38,7 @@ public:
/// Make sure the given GlobalValue is fully read.
///
virtual std::error_code Materialize(GlobalValue *GV) = 0;
virtual std::error_code materialize(GlobalValue *GV) = 0;
/// If the given GlobalValue is read in, and if the GVMaterializer supports
/// it, release the memory for the GV, and set it up to be materialized

4
include/llvm/IR/GlobalValue.h
View File

@ -21,6 +21,8 @@
#include "llvm/IR/Constant.h"
#include "llvm/IR/DerivedTypes.h"
#include <system_error>
namespace llvm {
class Comdat;
@ -311,7 +313,7 @@ public:
/// Make sure this GlobalValue is fully read. If the module is corrupt, this
/// returns true and fills in the optional string with information about the
/// problem. If successful, this returns false.
bool Materialize(std::string *ErrInfo = nullptr);
std::error_code materialize();
/// If this GlobalValue is read in, and if the GVMaterializer supports it,
/// release the memory for the function, and set it up to be materialized

2
include/llvm/IR/Module.h
View File

@ -476,7 +476,7 @@ public:
/// Make sure the GlobalValue is fully read. If the module is corrupt, this
/// returns true and fills in the optional string with information about the
/// problem. If successful, this returns false.
bool Materialize(GlobalValue *GV, std::string *ErrInfo = nullptr);
std::error_code materialize(GlobalValue *GV);
/// If the GlobalValue is read in, and if the GVMaterializer supports it,
/// release the memory for the function, and set it up to be materialized
/// lazily. If !isDematerializable(), this method is a noop.

6
lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -56,7 +56,7 @@ std::error_code BitcodeReader::materializeForwardReferencedFunctions() {
return Error(BitcodeError::NeverResolvedFunctionFromBlockAddress);
// Try to materialize F.
if (std::error_code EC = Materialize(F))
if (std::error_code EC = materialize(F))
return EC;
}
assert(BasicBlockFwdRefs.empty() && "Function missing from queue");
@ -3282,7 +3282,7 @@ std::error_code BitcodeReader::FindFunctionInStream(
void BitcodeReader::releaseBuffer() { Buffer.release(); }
std::error_code BitcodeReader::Materialize(GlobalValue *GV) {
std::error_code BitcodeReader::materialize(GlobalValue *GV) {
Function *F = dyn_cast<Function>(GV);
// If it's not a function or is already material, ignore the request.
if (!F || !F->isMaterializable())
@ -3358,7 +3358,7 @@ std::error_code BitcodeReader::MaterializeModule(Module *M) {
for (Module::iterator F = TheModule->begin(), E = TheModule->end();
F != E; ++F) {
if (F->isMaterializable()) {
if (std::error_code EC = Materialize(F))
if (std::error_code EC = materialize(F))
return EC;
}
}

2
lib/Bitcode/Reader/BitcodeReader.h
View File

@ -224,7 +224,7 @@ public:
void releaseBuffer();
bool isDematerializable(const GlobalValue *GV) const override;
std::error_code Materialize(GlobalValue *GV) override;
std::error_code materialize(GlobalValue *GV) override;
std::error_code MaterializeModule(Module *M) override;
void Dematerialize(GlobalValue *GV) override;

4
lib/IR/Globals.cpp
View File

@ -36,8 +36,8 @@ bool GlobalValue::isMaterializable() const {
bool GlobalValue::isDematerializable() const {
return getParent() && getParent()->isDematerializable(this);
}
bool GlobalValue::Materialize(std::string *ErrInfo) {
return getParent()->Materialize(this, ErrInfo);
std::error_code GlobalValue::materialize() {
return getParent()->materialize(this);
}
void GlobalValue::Dematerialize() {
getParent()->Dematerialize(this);

5
lib/IR/LegacyPassManager.cpp
View File

@ -1404,9 +1404,8 @@ void FunctionPassManager::add(Pass *P) {
///
bool FunctionPassManager::run(Function &F) {
if (F.isMaterializable()) {
std::string errstr;
if (F.Materialize(&errstr))
report_fatal_error("Error reading bitcode file: " + Twine(errstr));
if (std::error_code EC = F.materialize())
report_fatal_error("Error reading bitcode file: " + EC.message());
}
return FPM->run(F);
}

11
lib/IR/Module.cpp
View File

@ -395,16 +395,11 @@ bool Module::isDematerializable(const GlobalValue *GV) const {
return false;
}
bool Module::Materialize(GlobalValue *GV, std::string *ErrInfo) {
std::error_code Module::materialize(GlobalValue *GV) {
if (!Materializer)
return false;
return std::error_code();
std::error_code EC = Materializer->Materialize(GV);
if (!EC)
return false;
if (ErrInfo)
*ErrInfo = EC.message();
return true;
return Materializer->materialize(GV);
}
void Module::Dematerialize(GlobalValue *GV) {

8
lib/Linker/LinkModules.cpp
View File

@ -1626,8 +1626,10 @@ bool ModuleLinker::run() {
// Materialize if needed.
if (SF->isMaterializable()) {
if (SF->Materialize(&ErrorMsg))
if (std::error_code EC = SF->materialize()) {
ErrorMsg = EC.message();
return true;
}
}
// Skip if no body (function is external).
@ -1677,8 +1679,10 @@ bool ModuleLinker::run() {
// Materialize if needed.
if (SF->isMaterializable()) {
if (SF->Materialize(&ErrorMsg))
if (std::error_code EC = SF->materialize()) {
ErrorMsg = EC.message();
return true;
}
}
// Skip if no body (function is external).

7
tools/gold/gold-plugin.cpp
View File

@ -482,8 +482,11 @@ static GlobalObject *makeInternalReplacement(GlobalObject *GO) {
Module *M = GO->getParent();
GlobalObject *Ret;
if (auto *F = dyn_cast<Function>(GO)) {
if (F->isMaterializable())
F->Materialize();
if (F->isMaterializable()) {
if (std::error_code EC = F->materialize())
message(LDPL_FATAL, "LLVM gold plugin has failed to read a function");
}
auto *NewF = Function::Create(F->getFunctionType(), F->getLinkage(),
F->getName(), M);

18
tools/llvm-extract/llvm-extract.cpp
View File

@ -217,9 +217,9 @@ int main(int argc, char **argv) {
for (size_t i = 0, e = GVs.size(); i != e; ++i) {
GlobalValue *GV = GVs[i];
if (GV->isMaterializable()) {
std::string ErrInfo;
if (GV->Materialize(&ErrInfo)) {
errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
if (std::error_code EC = GV->materialize()) {
errs() << argv[0] << ": error reading input: " << EC.message()
<< "\n";
return 1;
}
}
@ -229,18 +229,18 @@ int main(int argc, char **argv) {
SmallPtrSet<GlobalValue *, 8> GVSet(GVs.begin(), GVs.end());
for (auto &G : M->globals()) {
if (!GVSet.count(&G) && G.isMaterializable()) {
std::string ErrInfo;
if (G.Materialize(&ErrInfo)) {
errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
if (std::error_code EC = G.materialize()) {
errs() << argv[0] << ": error reading input: " << EC.message()
<< "\n";
return 1;
}
}
}
for (auto &F : *M) {
if (!GVSet.count(&F) && F.isMaterializable()) {
std::string ErrInfo;
if (F.Materialize(&ErrInfo)) {
errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
if (std::error_code EC = F.materialize()) {
errs() << argv[0] << ": error reading input: " << EC.message()
<< "\n";
return 1;
}
}

6
unittests/Bitcode/BitReaderTest.cpp
View File

@ -69,7 +69,7 @@ TEST(BitReaderTest, DematerializeFunctionPreservesLinkageType) {
EXPECT_FALSE(verifyModule(*M, &dbgs()));
M->getFunction("func")->Materialize();
M->getFunction("func")->materialize();
EXPECT_FALSE(M->getFunction("func")->empty());
EXPECT_TRUE(M->getFunction("func")->getLinkage() ==
GlobalValue::InternalLinkage);
@ -121,7 +121,7 @@ TEST(BitReaderTest, MaterializeFunctionsForBlockAddrInFunctionBefore) {
EXPECT_FALSE(verifyModule(*M, &dbgs()));
// Materialize @before, pulling in @func.
EXPECT_FALSE(M->getFunction("before")->Materialize());
EXPECT_FALSE(M->getFunction("before")->materialize());
EXPECT_FALSE(M->getFunction("func")->empty());
EXPECT_TRUE(M->getFunction("other")->empty());
EXPECT_FALSE(verifyModule(*M, &dbgs()));
@ -153,7 +153,7 @@ TEST(BitReaderTest, MaterializeFunctionsForBlockAddrInFunctionAfter) {
EXPECT_FALSE(verifyModule(*M, &dbgs()));
// Materialize @after, pulling in @func.
EXPECT_FALSE(M->getFunction("after")->Materialize());
EXPECT_FALSE(M->getFunction("after")->materialize());
EXPECT_FALSE(M->getFunction("func")->empty());
EXPECT_TRUE(M->getFunction("other")->empty());
EXPECT_FALSE(verifyModule(*M, &dbgs()));