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

Update to llvm/clang r202469.

Browse Source
This commit is contained in:
Axel Naumann 2014-03-03 17:57:47 +01:00 committed by sftnight
parent 6b647a89cd
commit 5294658610
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Interpreter/Interpreter.cpp
View File

@ -987,12 +987,12 @@ namespace cling {
m_Callbacks.reset(C);
// FIXME: We should add a multiplexer in the ASTContext, too.
llvm::OwningPtr<ExternalASTSource> astContextExternalSource;
astContextExternalSource.reset(getSema().getExternalSource());
llvm::IntrusiveRefCntPtr<ExternalASTSource>
astContextExternalSource(getSema().getExternalSource());
clang::ASTContext& Ctx = getSema().getASTContext();
// FIXME: This is a gross hack. We must make multiplexer in the astcontext,
// or a derived class that extends what we need.
Ctx.ExternalSource.take(); // FIXME: make sure we delete it.
Ctx.ExternalSource.resetWithoutRelease(); // FIXME: make sure we delete it.
Ctx.setExternalSource(astContextExternalSource);
}

8
lib/Interpreter/InterpreterCallbacks.cpp
View File

@ -100,8 +100,8 @@ namespace cling {
if (m_Sema) {
ASTContext& C = m_Sema->getASTContext();
// tell the owning ptr to not delete it, the callbacks will delete it.
if (C.ExternalSource.take() == this)
C.ExternalSource.reset(0);
if (C.ExternalSource.getPtr() == this)
C.ExternalSource.resetWithoutRelease();
}
}
@ -160,7 +160,7 @@ namespace cling {
m_DeserializationListener(IDL), m_IsRuntime(false) {
if (IESS)
m_Interpreter->getSema().addExternalSource(m_ExternalSemaSource.get());
ASTReader* Reader = m_Interpreter->getCI()->getModuleManager();
ASTReader* Reader = m_Interpreter->getCI()->getModuleManager().getPtr();
if (IDL && Reader)
Reader->setDeserializationListener(IDL);
if (IPPC)
@ -179,7 +179,7 @@ namespace cling {
m_Interpreter->getSema().addExternalSource(m_ExternalSemaSource.get());
}
ASTReader* Reader = m_Interpreter->getCI()->getModuleManager();
ASTReader* Reader = m_Interpreter->getCI()->getModuleManager().getPtr();
if (enableDeserializationListenerCallbacks && Reader) {
// FIXME: need to create a multiplexer if a DeserializationListener is
// alreday present.