gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Interpreter::getModule.

Browse Source
This commit is contained in:
Vassil Vassilev 2014-03-03 11:49:01 +01:00 committed by sftnight
parent 8d457e947f
commit c7e7156ce1
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/cling/Interpreter/Interpreter.h
View File

@ -518,8 +518,6 @@ namespace cling {
clang::Sema& getSema();
llvm::ExecutionEngine* getExecutionEngine() const;
llvm::Module* getModule() const;
//FIXME: This must be in InterpreterCallbacks.
void installLazyFunctionCreator(void* (*fp)(const std::string&));

15
lib/Interpreter/Interpreter.cpp
View File

@ -138,7 +138,7 @@ namespace cling {
const CompilerInstance& CI = *m_Interpreter->getCI();
m_State.reset(new ClangInternalState(CI.getASTContext(),
CI.getPreprocessor(),
i->getModule(),
i->getCodeGenerator()->GetModule(),
i->getCodeGenerator(),
"aName"));
}
@ -334,7 +334,8 @@ namespace cling {
PushTransactionRAII RAII(this);
ClangInternalState* state
= new ClangInternalState(getCI()->getASTContext(),
getCI()->getPreprocessor(), getModule(),
getCI()->getPreprocessor(),
getCodeGenerator()->GetModule(),
getCodeGenerator(), name);
m_StoredStates.push_back(state);
}
@ -461,12 +462,6 @@ namespace cling {
return m_Executor->getExecutionEngine();
}
llvm::Module* Interpreter::getModule() const {
if (m_IncrParser->hasCodeGenerator())
return m_IncrParser->getCodeGenerator()->GetModule();
return 0;
}
///\brief Maybe transform the input line to implement cint command line
/// semantics (declarations are global) and compile to produce a module.
///
@ -821,7 +816,7 @@ namespace cling {
//
const llvm::GlobalValue* GV = 0;
if (ifUnique)
GV = getModule()->getNamedValue(name);
GV = getCodeGenerator()->GetModule()->getNamedValue(name);
if (!GV) {
const FunctionDecl* FD = DeclareCFunction(name, code, withAccessControl);
@ -830,7 +825,7 @@ namespace cling {
// Get the wrapper function pointer
// from the ExecutionEngine (the JIT).
//
GV = getModule()->getNamedValue(name);
GV = getCodeGenerator()->GetModule()->getNamedValue(name);
}
if (!GV)