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

Merge LookupHelper with master

Browse Source
This commit is contained in:
Philippe Canal 2013-08-11 10:07:39 -05:00 committed by sftnight
parent 31b60e0ab5
commit 59db7bbeea
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Interpreter/LookupHelper.cpp
View File

@ -603,7 +603,6 @@ namespace cling {
SourceLocation FuncNameLoc = FuncNameInfo.getLoc();
LookupResult Result(S, FuncName, FuncNameLoc, Sema::LookupMemberName,
Sema::NotForRedeclaration);
Interpreter::PushTransactionRAII pushedT(m_Interpreter);
if (!S.LookupQualifiedName(Result, foundDC)) {
// Lookup failed.
// Destroy the scope we created first, and
@ -725,6 +724,7 @@ namespace cling {
return 0;
}
Interpreter::PushTransactionRAII pushedT(m_Interpreter);
return findFunction(foundDC, SS,
funcName, GivenArgs, objectIsConst,
Context, P, S,
@ -826,6 +826,7 @@ namespace cling {
return 0;
}
Interpreter::PushTransactionRAII pushedT(m_Interpreter);
return findFunction(foundDC, SS,
funcName, GivenArgs, objectIsConst,
Context, P, S, overloadFunctionSelector);
@ -954,6 +955,7 @@ namespace cling {
ParserStateRAII ResetParserState(P);
llvm::SmallVector<Expr*, 4> GivenArgs;
Interpreter::PushTransactionRAII pushedT(m_Interpreter);
return findFunction(foundDC, SS,
funcName, GivenArgs, false /* objectIsConst */,
Context, P, S, hasFunctionSelector);