OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[analyzer] Address Jordan's feedback for r167780. 

llvm-svn: 167790
This commit is contained in:
Anna Zaks 2012-11-13 00:13:44 +00:00
parent e6ee671e16
commit abdc72d970
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
View File

@ -191,12 +191,13 @@ void ExprEngine::removeDeadOnEndOfFunction(NodeBuilderContext& BC,
currBldrCtx = 0; currBldrCtx = 0;
} }
static bool isDifferentDeclUsedAtRuntime(CallEventRef<> Call, static bool wasDifferentDeclUsedForInlining(CallEventRef<> Call,
const StackFrameContext *calleeCtx) { const StackFrameContext *calleeCtx) {
const Decl *RuntimeCallee = calleeCtx->getDecl(); const Decl *RuntimeCallee = calleeCtx->getDecl();
const Decl *StaticDecl = Call->getDecl(); const Decl *StaticDecl = Call->getDecl();
if (!RuntimeCallee || !StaticDecl) assert(RuntimeCallee);
return false; if (!StaticDecl)
return true;
return RuntimeCallee->getCanonicalDecl() != StaticDecl->getCanonicalDecl(); return RuntimeCallee->getCanonicalDecl() != StaticDecl->getCanonicalDecl();
} }
@ -240,7 +241,7 @@ void ExprEngine::processCallExit(ExplodedNode *CEBNode) {
SVal V = state->getSVal(RS, LCtx); SVal V = state->getSVal(RS, LCtx);
// Ensure that the return type matches the type of the returned Expr. // Ensure that the return type matches the type of the returned Expr.
if (isDifferentDeclUsedAtRuntime(Call, calleeCtx)) { if (wasDifferentDeclUsedForInlining(Call, calleeCtx)) {
QualType ReturnedTy = QualType ReturnedTy =
CallEvent::getDeclaredResultType(calleeCtx->getDecl()); CallEvent::getDeclaredResultType(calleeCtx->getDecl());
if (!ReturnedTy.isNull()) { if (!ReturnedTy.isNull()) {