[cfe-commits] r163442 - in /cfe/trunk: lib/StaticAnalyzer/Core/ExprEngineCXX.cpp test/Analysis/inline.cpp
Jordan Rose
jordan_rose at apple.com
Fri Sep 7 18:24:38 PDT 2012
Author: jrose
Date: Fri Sep 7 20:24:38 2012
New Revision: 163442
URL: http://llvm.org/viewvc/llvm-project?rev=163442&view=rev
Log:
[analyzer] Cast the result of a placement new-expression to the correct type.
This is necessary because further analysis will assume that the SVal's
type matches the AST type. This caused a crash when trying to perform
a derived-to-base cast on a C++ object that had been new'd to be another
object type.
Yet another crash in PR13763.
Modified:
cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp
cfe/trunk/test/Analysis/inline.cpp
Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp?rev=163442&r1=163441&r2=163442&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp Fri Sep 7 20:24:38 2012
@@ -250,7 +250,9 @@
if (FD && FD->isReservedGlobalPlacementOperator()) {
// Non-array placement new should always return the placement location.
SVal PlacementLoc = State->getSVal(CNE->getPlacementArg(0), LCtx);
- State = State->BindExpr(CNE, LCtx, PlacementLoc);
+ SVal Result = svalBuilder.evalCast(PlacementLoc, CNE->getType(),
+ CNE->getPlacementArg(0)->getType());
+ State = State->BindExpr(CNE, LCtx, Result);
} else {
State = State->BindExpr(CNE, LCtx, symVal);
}
Modified: cfe/trunk/test/Analysis/inline.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/inline.cpp?rev=163442&r1=163441&r2=163442&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/inline.cpp (original)
+++ cfe/trunk/test/Analysis/inline.cpp Fri Sep 7 20:24:38 2012
@@ -270,8 +270,13 @@
namespace VirtualWithSisterCasts {
+ // This entire set of tests exercises casts from sister classes and
+ // from classes outside the hierarchy, which can very much confuse
+ // code that uses DynamicTypeInfo or needs to construct CXXBaseObjectRegions.
+ // These examples used to cause crashes in +Asserts builds.
struct Parent {
virtual int foo();
+ int x;
};
struct A : Parent {
@@ -282,20 +287,41 @@
virtual int foo();
};
+ struct Grandchild : public A {};
+
struct Unrelated {};
void testDowncast(Parent *b) {
A *a = (A *)(void *)b;
clang_analyzer_eval(a->foo() == 42); // expected-warning{{UNKNOWN}}
+
+ a->x = 42;
+ clang_analyzer_eval(a->x == 42); // expected-warning{{TRUE}}
}
void testRelated(B *b) {
A *a = (A *)(void *)b;
clang_analyzer_eval(a->foo() == 42); // expected-warning{{UNKNOWN}}
+
+ a->x = 42;
+ clang_analyzer_eval(a->x == 42); // expected-warning{{TRUE}}
}
void testUnrelated(Unrelated *b) {
A *a = (A *)(void *)b;
clang_analyzer_eval(a->foo() == 42); // expected-warning{{UNKNOWN}}
+
+ a->x = 42;
+ clang_analyzer_eval(a->x == 42); // expected-warning{{TRUE}}
+ }
+
+ void testCastViaNew(B *b) {
+ Grandchild *g = new (b) Grandchild();
+ // FIXME: We actually now have perfect type info because of 'new'.
+ // This should be TRUE.
+ clang_analyzer_eval(g->foo() == 42); // expected-warning{{UNKNOWN}}
+
+ g->x = 42;
+ clang_analyzer_eval(g->x == 42); // expected-warning{{TRUE}}
}
}
More information about the cfe-commits
mailing list