Author: dergachev
Date: Thu Nov 29 20:26:17 2018
New Revision: 347956
URL: http://llvm.org/viewvc/llvm-project?rev=347956&view=rev
Log:
Revert r344580 "[analyzer] Nullability: Don't detect post factum violation..."
Fails under ASan!
Removed:
cfe/trunk/test/Analysis/nullability-arc.mm
Modified:
cfe/trunk/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp
cfe/trunk/test/Analysis/nullability.mm
Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp?rev=347956&r1=347955&r2=347956&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Checkers/NullabilityChecker.cpp Thu Nov 29
20:26:17 2018
@@ -329,8 +329,8 @@ NullabilityChecker::NullabilityBugVisito
nullptr);
}
-/// Returns true when the value stored at the given location has been
-/// constrained to null after being passed through an object of nonnnull type.
+/// Returns true when the value stored at the given location is null
+/// and the passed in type is nonnnull.
static bool checkValueAtLValForInvariantViolation(ProgramStateRef State,
SVal LV, QualType T) {
if (getNullabilityAnnotation(T) != Nullability::Nonnull)
@@ -340,14 +340,9 @@ static bool checkValueAtLValForInvariant
if (!RegionVal)
return false;
- // If the value was constrained to null *after* it was passed through that
- // location, it could not have been a concrete pointer *when* it was passed.
- // In that case we would have handled the situation when the value was
- // bound to that location, by emitting (or not emitting) a report.
- // Therefore we are only interested in symbolic regions that can be either
- // null or non-null depending on the value of their respective symbol.
- auto StoredVal = State->getSVal(*RegionVal).getAs<loc::MemRegionVal>();
- if (!StoredVal || !isa<SymbolicRegion>(StoredVal->getRegion()))
+ auto StoredVal =
+ State->getSVal(RegionVal->getRegion()).getAs<DefinedOrUnknownSVal>();
+ if (!StoredVal)
return false;
if (getNullConstraint(*StoredVal, State) == NullConstraint::IsNull)
@@ -1175,15 +1170,10 @@ void NullabilityChecker::printState(raw_
NullabilityMapTy B = State->get<NullabilityMap>();
- if (State->get<InvariantViolated>())
- Out << Sep << NL
- << "Nullability invariant was violated, warnings suppressed." << NL;
-
if (B.isEmpty())
return;
- if (!State->get<InvariantViolated>())
- Out << Sep << NL;
+ Out << Sep << NL;
for (NullabilityMapTy::iterator I = B.begin(), E = B.end(); I != E; ++I) {
Out << I->first << " : ";
Removed: cfe/trunk/test/Analysis/nullability-arc.mm
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/nullability-arc.mm?rev=347955&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/nullability-arc.mm (original)
+++ cfe/trunk/test/Analysis/nullability-arc.mm (removed)
@@ -1,39 +0,0 @@
-// RUN: %clang_analyze_cc1 -w -analyzer-checker=core,nullability\
-// RUN: -analyzer-output=text -verify %s
-// RUN: %clang_analyze_cc1 -w -analyzer-checker=core,nullability\
-// RUN: -analyzer-output=text -verify %s -fobjc-arc
-
-#if !__has_feature(objc_arc)
-// expected-no-diagnostics
-#endif
-
-
-#define nil ((id)0)
-
-@interface Param
-@end
-
-@interface Base
-- (void)foo:(Param *_Nonnull)param;
-@end
-
-@interface Derived : Base
-@end
-
-@implementation Derived
-- (void)foo:(Param *)param {
- // FIXME: Why do we not emit the warning under ARC?
- [super foo:param];
-#if __has_feature(objc_arc)
- // expected-warning@-2{{nil passed to a callee that requires a non-null 1st
parameter}}
- // expected-note@-3 {{nil passed to a callee that requires a non-null 1st
parameter}}
-#endif
-
- [self foo:nil];
-#if __has_feature(objc_arc)
- // expected-note@-2{{Calling 'foo:'}}
- // expected-note@-3{{Passing nil object reference via 1st parameter 'param'}}
-#endif
-}
-@end
-
Modified: cfe/trunk/test/Analysis/nullability.mm
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/nullability.mm?rev=347956&r1=347955&r2=347956&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/nullability.mm (original)
+++ cfe/trunk/test/Analysis/nullability.mm Thu Nov 29 20:26:17 2018
@@ -1,36 +1,5 @@
-// RUN: %clang_analyze_cc1 -fblocks -verify %s -analyzer-checker=core \
-// RUN: -analyzer-checker=nullability.NullPassedToNonnull \
-// RUN: -analyzer-checker=nullability.NullReturnedFromNonnull \
-// RUN: -analyzer-checker=nullability.NullablePassedToNonnull \
-// RUN: -analyzer-checker=nullability.NullableReturnedFromNonnull \
-// RUN: -analyzer-checker=nullability.NullableDereferenced \
-// RUN: -DNOSYSTEMHEADERS=0
-
-// RUN: %clang_analyze_cc1 -fblocks -verify %s -analyzer-checker=core \
-// RUN: -analyzer-checker=nullability.NullPassedToNonnull \
-// RUN: -analyzer-checker=nullability.NullReturnedFromNonnull \
-// RUN: -analyzer-checker=nullability.NullablePassedToNonnull \
-// RUN: -analyzer-checker=nullability.NullableReturnedFromNonnull \
-// RUN: -analyzer-checker=nullability.NullableDereferenced \
-// RUN: -DNOSYSTEMHEADERS=1 \
-// RUN: -analyzer-config nullability:NoDiagnoseCallsToSystemHeaders=true
-
-// RUN: %clang_analyze_cc1 -fblocks -verify %s -analyzer-checker=core\
-// RUN: -analyzer-checker=nullability.NullPassedToNonnull\
-// RUN: -analyzer-checker=nullability.NullReturnedFromNonnull\
-// RUN: -analyzer-checker=nullability.NullablePassedToNonnull\
-// RUN: -analyzer-checker=nullability.NullableReturnedFromNonnull\
-// RUN: -analyzer-checker=nullability.NullableDereferenced\
-// RUN: -DNOSYSTEMHEADERS=0 -fobjc-arc
-
-// RUN: %clang_analyze_cc1 -fblocks -verify %s -analyzer-checker=core\
-// RUN: -analyzer-checker=nullability.NullPassedToNonnull\
-// RUN: -analyzer-checker=nullability.NullReturnedFromNonnull\
-// RUN: -analyzer-checker=nullability.NullablePassedToNonnull\
-// RUN: -analyzer-checker=nullability.NullableReturnedFromNonnull\
-// RUN: -analyzer-checker=nullability.NullableDereferenced\
-// RUN: -DNOSYSTEMHEADERS=1 -fobjc-arc\
-// RUN: -analyzer-config nullability:NoDiagnoseCallsToSystemHeaders=true
+// RUN: %clang_analyze_cc1 -fblocks
-analyzer-checker=core,nullability.NullPassedToNonnull,nullability.NullReturnedFromNonnull,nullability.NullablePassedToNonnull,nullability.NullableReturnedFromNonnull,nullability.NullableDereferenced
-DNOSYSTEMHEADERS=0 -verify %s
+// RUN: %clang_analyze_cc1 -fblocks
-analyzer-checker=core,nullability.NullPassedToNonnull,nullability.NullReturnedFromNonnull,nullability.NullablePassedToNonnull,nullability.NullableReturnedFromNonnull,nullability.NullableDereferenced
-analyzer-config nullability:NoDiagnoseCallsToSystemHeaders=true
-DNOSYSTEMHEADERS=1 -verify %s
#include "Inputs/system-header-simulator-for-nullability.h"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
