From 99c6c2b4e241429647c67cb8a67250d4b9234c69 Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Wed, 12 Sep 2012 21:48:13 +0000 Subject: Revert "[analyzer] Use the static type for a virtual call if the dynamic type is worse." Using the static type may be inconsistent with later calls. We should just report that there is no inlining definition available if the static type is better than the dynamic type. See next commit. This reverts r163644 / 19d5886d1704e24282c86217b09d5c6d35ba604d. llvm-svn: 163744 --- clang/lib/StaticAnalyzer/Core/CallEvent.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'clang/lib/StaticAnalyzer/Core/CallEvent.cpp') diff --git a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp index 0f71a76842e..09ba21173ba 100644 --- a/clang/lib/StaticAnalyzer/Core/CallEvent.cpp +++ b/clang/lib/StaticAnalyzer/Core/CallEvent.cpp @@ -433,21 +433,14 @@ RuntimeDefinition CXXInstanceCall::getRuntimeDefinition() const { if (!RD || !RD->hasDefinition()) return RuntimeDefinition(); - const CXXMethodDecl *Result; - if (MD->getParent()->isDerivedFrom(RD)) { - // If our static type info is better than our dynamic type info, don't - // bother doing a search. Just use the static method. - Result = MD; - } else { - // Otherwise, find the decl for the method in the dynamic class. - Result = MD->getCorrespondingMethodInClass(RD, true); - } - + // Find the decl for this method in that class. + const CXXMethodDecl *Result = MD->getCorrespondingMethodInClass(RD, true); if (!Result) { // We might not even get the original statically-resolved method due to // some particularly nasty casting (e.g. casts to sister classes). // However, we should at least be able to search up and down our own class // hierarchy, and some real bugs have been caught by checking this. + assert(!MD->getParent()->isDerivedFrom(RD) && "Bad DynamicTypeInfo"); assert(!RD->isDerivedFrom(MD->getParent()) && "Couldn't find known method"); return RuntimeDefinition(); } -- cgit v1.2.3