commit 9f55817e5fdbf2e7027f76727d247b7d9264e351
author Wei Yi Tee <wyt@google.com> Mon Jul 25 08:34:56 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 25 08:35:32 2022 -0700
tree fa24a29550cda3f53f708ccfa3b0059350677e80
parent e986673145fbd0ff1e70b07482d3a980a9daad74

Remove creation of PointerValue for `nullptr`.

The core dataflow framework has been updated to process and create PointerValues for null pointer literals, so we can remove this from the analysis.

PiperOrigin-RevId: 463092470

nullability_verification/pointer_nullability_analysis.cc

diff --git a/nullability_verification/pointer_nullability_analysis.cc b/nullability_verification/pointer_nullability_analysis.cc
index 0745567..a5c1d3d 100644
--- a/nullability_verification/pointer_nullability_analysis.cc
+++ b/nullability_verification/pointer_nullability_analysis.cc
@@ -72,21 +72,8 @@
 void transferNullPointerLiteral(
     const Expr* NullPointer, const MatchFinder::MatchResult& Result,
     TransferState<PointerNullabilityLattice>& State) {
-  auto* NullPointerVal = cast_or_null<PointerValue>(
-      State.Env.getValue(*NullPointer, SkipPast::None));
-  if (NullPointerVal == nullptr) {
-    // Create storage location and value for null pointer if it doesn't exist
-    auto& NullPointerLoc = State.Env.createStorageLocation(*NullPointer);
-    NullPointerVal = &State.Env.takeOwnership(
-        std::make_unique<PointerValue>(NullPointerLoc));
-    State.Env.setStorageLocation(*NullPointer, NullPointerLoc);
-    State.Env.setValue(NullPointerLoc, *NullPointerVal);
-  }
-  if (!State.Lattice.hasPointerNotNullProperty(NullPointerVal)) {
-    // Set null pointer to be known null if not already set
-    State.Lattice.setPointerNotNullProperty(
-        NullPointerVal, &State.Env.getBoolLiteralValue(false));
-  }
+  initialisePointerNotNullProperty(NullPointer, State,
+                                   &State.Env.getBoolLiteralValue(false));
 }
 
 void transferAddrOf(const UnaryOperator* UnaryOp,

nullability_verification/pointer_nullability_matchers.cc

diff --git a/nullability_verification/pointer_nullability_matchers.cc b/nullability_verification/pointer_nullability_matchers.cc
index e3b235e..e1c95d5 100644
--- a/nullability_verification/pointer_nullability_matchers.cc
+++ b/nullability_verification/pointer_nullability_matchers.cc
@@ -22,12 +22,10 @@
 using ast_matchers::hasOperatorName;
 using ast_matchers::hasType;
 using ast_matchers::hasUnaryOperand;
-using ast_matchers::ignoringImplicit;
 using ast_matchers::implicitCastExpr;
 using ast_matchers::isAnyPointer;
 using ast_matchers::isArrow;
 using ast_matchers::memberExpr;
-using ast_matchers::nullPointerConstant;
 using ast_matchers::unaryOperator;
 using ast_matchers::internal::Matcher;
 
@@ -36,7 +34,8 @@
   return declRefExpr(hasType(isAnyPointer()));
 }
 Matcher<Stmt> isNullPointerLiteral() {
-  return expr(ignoringImplicit(nullPointerConstant()));
+  return implicitCastExpr(anyOf(hasCastKind(CK_NullToPointer),
+                                hasCastKind(CK_NullToMemberPointer)));
 }
 Matcher<Stmt> isAddrOf() { return unaryOperator(hasOperatorName("&")); }
 Matcher<Stmt> isPointerDereference() {