While in GlobalValue fix the function(s) that don't follow the

naming convention and update users.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237461 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2015-05-15 18:20:14 +00:00
parent 85e632de29
commit 1bef1cdd92
8 changed files with 18 additions and 18 deletions

View File

@ -47,11 +47,11 @@ public:
/// lazily. If the Materializer doesn't support this capability, this method /// lazily. If the Materializer doesn't support this capability, this method
/// is a noop. /// is a noop.
/// ///
virtual void Dematerialize(GlobalValue *) {} virtual void dematerialize(GlobalValue *) {}
/// Make sure the entire Module has been completely read. /// Make sure the entire Module has been completely read.
/// ///
virtual std::error_code MaterializeModule(Module *M) = 0; virtual std::error_code materializeModule(Module *M) = 0;
virtual std::error_code materializeMetadata() = 0; virtual std::error_code materializeMetadata() = 0;
virtual void setStripDebugInfo() = 0; virtual void setStripDebugInfo() = 0;

View File

@ -317,7 +317,7 @@ public:
/// If this GlobalValue is read in, and if the GVMaterializer supports it, /// 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 /// release the memory for the function, and set it up to be materialized
/// lazily. If !isDematerializable(), this method is a noop. /// lazily. If !isDematerializable(), this method is a noop.
void Dematerialize(); void dematerialize();
/// @} /// @}

View File

@ -492,7 +492,7 @@ public:
/// If the GlobalValue is read in, and if the GVMaterializer supports it, /// 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 /// release the memory for the function, and set it up to be materialized
/// lazily. If !isDematerializable(), this method is a no-op. /// lazily. If !isDematerializable(), this method is a no-op.
void Dematerialize(GlobalValue *GV); void dematerialize(GlobalValue *GV);
/// Make sure all GlobalValues in this Module are fully read. /// Make sure all GlobalValues in this Module are fully read.
std::error_code materializeAll(); std::error_code materializeAll();

View File

@ -240,9 +240,9 @@ public:
bool isDematerializable(const GlobalValue *GV) const override; 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; std::error_code materializeModule(Module *M) override;
std::vector<StructType *> getIdentifiedStructTypes() const override; std::vector<StructType *> getIdentifiedStructTypes() const override;
void Dematerialize(GlobalValue *GV) override; void dematerialize(GlobalValue *GV) override;
/// @brief Main interface to parsing a bitcode buffer. /// @brief Main interface to parsing a bitcode buffer.
/// @returns true if an error occurred. /// @returns true if an error occurred.
@ -4447,7 +4447,7 @@ bool BitcodeReader::isDematerializable(const GlobalValue *GV) const {
return DeferredFunctionInfo.count(const_cast<Function*>(F)); return DeferredFunctionInfo.count(const_cast<Function*>(F));
} }
void BitcodeReader::Dematerialize(GlobalValue *GV) { void BitcodeReader::dematerialize(GlobalValue *GV) {
Function *F = dyn_cast<Function>(GV); Function *F = dyn_cast<Function>(GV);
// If this function isn't dematerializable, this is a noop. // If this function isn't dematerializable, this is a noop.
if (!F || !isDematerializable(F)) if (!F || !isDematerializable(F))
@ -4460,7 +4460,7 @@ void BitcodeReader::Dematerialize(GlobalValue *GV) {
F->setIsMaterializable(true); F->setIsMaterializable(true);
} }
std::error_code BitcodeReader::MaterializeModule(Module *M) { std::error_code BitcodeReader::materializeModule(Module *M) {
assert(M == TheModule && assert(M == TheModule &&
"Can only Materialize the Module this BitcodeReader is attached to."); "Can only Materialize the Module this BitcodeReader is attached to.");

View File

@ -38,8 +38,8 @@ bool GlobalValue::isDematerializable() const {
std::error_code GlobalValue::materialize() { std::error_code GlobalValue::materialize() {
return getParent()->materialize(this); return getParent()->materialize(this);
} }
void GlobalValue::Dematerialize() { void GlobalValue::dematerialize() {
getParent()->Dematerialize(this); getParent()->dematerialize(this);
} }
/// Override destroyConstant to make sure it doesn't get called on /// Override destroyConstant to make sure it doesn't get called on

View File

@ -394,15 +394,15 @@ std::error_code Module::materialize(GlobalValue *GV) {
return Materializer->materialize(GV); return Materializer->materialize(GV);
} }
void Module::Dematerialize(GlobalValue *GV) { void Module::dematerialize(GlobalValue *GV) {
if (Materializer) if (Materializer)
return Materializer->Dematerialize(GV); return Materializer->dematerialize(GV);
} }
std::error_code Module::materializeAll() { std::error_code Module::materializeAll() {
if (!Materializer) if (!Materializer)
return std::error_code(); return std::error_code();
return Materializer->MaterializeModule(this); return Materializer->materializeModule(this);
} }
std::error_code Module::materializeAllPermanently() { std::error_code Module::materializeAllPermanently() {

View File

@ -1227,7 +1227,7 @@ bool ModuleLinker::linkFunctionBody(Function &Dst, Function &Src) {
for (Argument &Arg : Src.args()) for (Argument &Arg : Src.args())
ValueMap.erase(&Arg); ValueMap.erase(&Arg);
Src.Dematerialize(); Src.dematerialize();
return false; return false;
} }

View File

@ -75,7 +75,7 @@ TEST(BitReaderTest, DematerializeFunctionPreservesLinkageType) {
GlobalValue::InternalLinkage); GlobalValue::InternalLinkage);
// Check that the linkage type is preserved after dematerialization. // Check that the linkage type is preserved after dematerialization.
M->getFunction("func")->Dematerialize(); M->getFunction("func")->dematerialize();
EXPECT_TRUE(M->getFunction("func")->empty()); EXPECT_TRUE(M->getFunction("func")->empty());
EXPECT_TRUE(M->getFunction("func")->getLinkage() == EXPECT_TRUE(M->getFunction("func")->getLinkage() ==
GlobalValue::InternalLinkage); GlobalValue::InternalLinkage);
@ -160,7 +160,7 @@ TEST(BitReaderTest, MaterializeFunctionsForBlockAddr) { // PR11677
EXPECT_FALSE(verifyModule(*M, &dbgs())); EXPECT_FALSE(verifyModule(*M, &dbgs()));
// Try (and fail) to dematerialize @func. // Try (and fail) to dematerialize @func.
M->getFunction("func")->Dematerialize(); M->getFunction("func")->dematerialize();
EXPECT_FALSE(M->getFunction("func")->empty()); EXPECT_FALSE(M->getFunction("func")->empty());
} }
@ -191,7 +191,7 @@ TEST(BitReaderTest, MaterializeFunctionsForBlockAddrInFunctionBefore) {
EXPECT_FALSE(verifyModule(*M, &dbgs())); EXPECT_FALSE(verifyModule(*M, &dbgs()));
// Try (and fail) to dematerialize @func. // Try (and fail) to dematerialize @func.
M->getFunction("func")->Dematerialize(); M->getFunction("func")->dematerialize();
EXPECT_FALSE(M->getFunction("func")->empty()); EXPECT_FALSE(M->getFunction("func")->empty());
EXPECT_FALSE(verifyModule(*M, &dbgs())); EXPECT_FALSE(verifyModule(*M, &dbgs()));
} }
@ -223,7 +223,7 @@ TEST(BitReaderTest, MaterializeFunctionsForBlockAddrInFunctionAfter) {
EXPECT_FALSE(verifyModule(*M, &dbgs())); EXPECT_FALSE(verifyModule(*M, &dbgs()));
// Try (and fail) to dematerialize @func. // Try (and fail) to dematerialize @func.
M->getFunction("func")->Dematerialize(); M->getFunction("func")->dematerialize();
EXPECT_FALSE(M->getFunction("func")->empty()); EXPECT_FALSE(M->getFunction("func")->empty());
EXPECT_FALSE(verifyModule(*M, &dbgs())); EXPECT_FALSE(verifyModule(*M, &dbgs()));
} }