commit a064982238f0f865028fca77dc181961f5669f17
author Dani Ferreira Franco Moura <danimoura@google.com> Fri Nov 11 07:55:05 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Nov 11 07:55:46 2022 -0800
tree 1de48d5159faf9175eb58401f7050615ec7861e7
parent 6d757aa5ef2e1dbd027d5c4ac232a5aa45cfc255

Refactor NotNull constraint to be Null instead.

This is just a stylistic change to reduce unnecessary negations :)

PiperOrigin-RevId: 487822332

nullability_verification/pointer_nullability.cc

diff --git a/nullability_verification/pointer_nullability.cc b/nullability_verification/pointer_nullability.cc
index 04ba12b..83453df 100644
--- a/nullability_verification/pointer_nullability.cc
+++ b/nullability_verification/pointer_nullability.cc
@@ -19,9 +19,9 @@
 
 /// The nullness information of a pointer is represented by two properties
 /// which indicate if a pointer's nullability (i.e., if the pointer can hold
-/// null) is `Known` and if the pointer's value is `NotNull`.
+/// null) is `Known` and if the pointer's value is `Null`.
 constexpr llvm::StringLiteral kKnown = "is_known";
-constexpr llvm::StringLiteral kNotNull = "is_notnull";
+constexpr llvm::StringLiteral kNull = "is_null";
 
 NullabilityKind getNullabilityKind(QualType Type, ASTContext& Ctx) {
   return Type->getNullability(Ctx).value_or(NullabilityKind::Unspecified);
@@ -36,9 +36,8 @@
 std::pair<AtomicBoolValue&, AtomicBoolValue&> getPointerNullState(
     const PointerValue& PointerVal, const Environment& Env) {
   auto& PointerKnown = *cast<AtomicBoolValue>(PointerVal.getProperty(kKnown));
-  auto& PointerNotNull =
-      *cast<AtomicBoolValue>(PointerVal.getProperty(kNotNull));
-  return {PointerKnown, PointerNotNull};
+  auto& PointerNull = *cast<AtomicBoolValue>(PointerVal.getProperty(kNull));
+  return {PointerKnown, PointerNull};
 }
 
 void initPointerBoolProperty(PointerValue& PointerVal, llvm::StringRef Name,
@@ -51,15 +50,15 @@
 
 void initPointerNullState(PointerValue& PointerVal, Environment& Env,
                           BoolValue* KnownConstraint,
-                          BoolValue* NotNullConstraint) {
+                          BoolValue* NullConstraint) {
   initPointerBoolProperty(PointerVal, kKnown, KnownConstraint, Env);
-  initPointerBoolProperty(PointerVal, kNotNull, NotNullConstraint, Env);
+  initPointerBoolProperty(PointerVal, kNull, NullConstraint, Env);
 }
 
 bool isNullable(const PointerValue& PointerVal, const Environment& Env) {
-  auto [PointerKnown, PointerNotNull] = getPointerNullState(PointerVal, Env);
+  auto [PointerKnown, PointerNull] = getPointerNullState(PointerVal, Env);
   auto& PointerNotKnownNull =
-      Env.makeNot(Env.makeAnd(PointerKnown, Env.makeNot(PointerNotNull)));
+      Env.makeNot(Env.makeAnd(PointerKnown, PointerNull));
   return !Env.flowConditionImplies(PointerNotKnownNull);
 }