diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-10-24 22:50:48 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-10-24 22:50:48 +0000 |
commit | 5a52e6dc9eeb07e44a62bdc828bc9b8b7348549d (patch) | |
tree | d103373d61ab3a674d71ed65a5758610bf5a6482 /llvm/lib/Bitcode/Reader | |
parent | 2813f496d98f3e6d2c9c2774601999e147af34ef (diff) | |
download | bcm5719-llvm-5a52e6dc9eeb07e44a62bdc828bc9b8b7348549d.tar.gz bcm5719-llvm-5a52e6dc9eeb07e44a62bdc828bc9b8b7348549d.zip |
Modernize the error handling of the Materialize function.
llvm-svn: 220600
Diffstat (limited to 'llvm/lib/Bitcode/Reader')
-rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 6 | ||||
-rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 507164c8468..45a08b38390 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -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; } } diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.h b/llvm/lib/Bitcode/Reader/BitcodeReader.h index 9f0f6686121..047fef8fbae 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.h +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.h @@ -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; |