diff options
| -rw-r--r-- | lib/StaticAnalyzer/Core/CallEvent.cpp | 3 | ||||
| -rw-r--r-- | test/Analysis/inlining/DynDispatchBifurcate.m | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/StaticAnalyzer/Core/CallEvent.cpp b/lib/StaticAnalyzer/Core/CallEvent.cpp index 496a7461cb..7a0cb4abe4 100644 --- a/lib/StaticAnalyzer/Core/CallEvent.cpp +++ b/lib/StaticAnalyzer/Core/CallEvent.cpp @@ -670,6 +670,9 @@ bool ObjCMethodCall::canBeOverridenInSubclass(ObjCInterfaceDecl *IDecl, if (InterfLoc.isValid() && SM.isFromMainFile(InterfLoc)) return false; + // Assume that property accessors are not overridden. + if (getMessageKind() == OCM_PropertyAccess) + return false; // We assume that if the method is public (declared outside of main file) or // has a parent which publicly declares the method, the method could be diff --git a/test/Analysis/inlining/DynDispatchBifurcate.m b/test/Analysis/inlining/DynDispatchBifurcate.m index 58145f11d7..6637dfdba5 100644 --- a/test/Analysis/inlining/DynDispatchBifurcate.m +++ b/test/Analysis/inlining/DynDispatchBifurcate.m @@ -160,10 +160,10 @@ int testCallToPublicAPICat(PublicSubClass *p) { // weither they are "public" or private. int testPublicProperty(PublicClass *p) { int x = 0; - [p setValue3:0]; - if ([p value3] != 0) - return 5/x; // expected-warning {{Division by zero}} // TODO: no warning, we should always inline the property. - return 5/[p value3];// expected-warning {{Division by zero}} + p.value3 = 0; + if (p.value3 != 0) + return 5/x; + return 5/p.value3;// expected-warning {{Division by zero}} } int testExtension(PublicClass *p) { |