diff options
| -rw-r--r-- | include/llvm/Module.h | 4 | ||||
| -rw-r--r-- | lib/VMCore/Module.cpp | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/llvm/Module.h b/include/llvm/Module.h index 18b081abc7..8e8f554abe 100644 --- a/include/llvm/Module.h +++ b/include/llvm/Module.h @@ -179,7 +179,7 @@ public: /// getNamedFunction - Return the first function in the module with the /// specified name, of arbitrary type. This method returns null if a function /// with the specified name is not found. - Function *getNamedFunction(const std::string &Name); + Function *getNamedFunction(const std::string &Name) const; /// @} /// @name Global Variable Accessors @@ -197,7 +197,7 @@ public: /// getNamedGlobal - Return the first global variable in the module with the /// specified name, of arbitrary type. This method returns null if a global /// with the specified name is not found. - GlobalVariable *getNamedGlobal(const std::string &Name); + GlobalVariable *getNamedGlobal(const std::string &Name) const; /// @} /// @name Type Accessors diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp index da7d410423..7dcd44ca2e 100644 --- a/lib/VMCore/Module.cpp +++ b/lib/VMCore/Module.cpp @@ -250,16 +250,16 @@ Function *Module::getMainFunction() { /// specified name, of arbitrary type. This method returns null if a function /// with the specified name is not found. /// -Function *Module::getNamedFunction(const std::string &Name) { +Function *Module::getNamedFunction(const std::string &Name) const { // Loop over all of the functions, looking for the function desired - Function *Found = 0; - for (iterator I = begin(), E = end(); I != E; ++I) + const Function *Found = 0; + for (const_iterator I = begin(), E = end(); I != E; ++I) if (I->getName() == Name) if (I->isExternal()) Found = I; else - return I; - return Found; // Non-external function not found... + return const_cast<Function*>(&(*I)); + return const_cast<Function*>(Found); // Non-external function not found... } //===----------------------------------------------------------------------===// @@ -287,13 +287,13 @@ GlobalVariable *Module::getGlobalVariable(const std::string &Name, /// specified name, of arbitrary type. This method returns null if a global /// with the specified name is not found. /// -GlobalVariable *Module::getNamedGlobal(const std::string &Name) { +GlobalVariable *Module::getNamedGlobal(const std::string &Name) const { // FIXME: This would be much faster with a symbol table that doesn't // discriminate based on type! - for (global_iterator I = global_begin(), E = global_end(); + for (const_global_iterator I = global_begin(), E = global_end(); I != E; ++I) if (I->getName() == Name) - return I; + return const_cast<GlobalVariable*>(&(*I)); return 0; } |