commit f7154ea4465b68745578ff32f7fa381c64c13699
author Googler <no-reply@google.com> Mon Dec 11 09:30:25 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Dec 11 09:32:27 2023 -0800
tree 9f9488f9ece4631e12c344d822a8301c272c8555
parent 1348eef8af6ce5ed6db6460ac592d27124ab0b2f

Annotate pointers in crubit/nullability Abseil nullability annotations.

PiperOrigin-RevId: 589849354
Change-Id: I741ec99392ad9e35870032df6f1d36e3986a7b23

nullability/pointer_nullability_lattice.h

diff --git a/nullability/pointer_nullability_lattice.h b/nullability/pointer_nullability_lattice.h
index 6457ca5..898e55f 100644
--- a/nullability/pointer_nullability_lattice.h
+++ b/nullability/pointer_nullability_lattice.h
@@ -9,6 +9,7 @@
 #include <optional>
 #include <ostream>
 
+#include "absl/base/nullability.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/check.h"
 #include "nullability/type_nullability.h"
@@ -31,7 +32,8 @@
     // These are set by PointerNullabilityAnalysis::assignNullabilityVariable,
     // and take precedence over the declared type and over any result from
     // ConcreteNullabilityOverride.
-    absl::flat_hash_map<const ValueDecl *, PointerTypeNullability>
+    absl::flat_hash_map<absl::Nonnull<const ValueDecl *>,
+                        PointerTypeNullability>
         DeclTopLevelNullability;
     // Returns overriding concrete nullability for decls. This is set by
     // PointerNullabilityAnalysis::assignNullabilityOverride, and the result, if
@@ -43,7 +45,8 @@
 
   PointerNullabilityLattice(NonFlowSensitiveState &NFS) : NFS(NFS) {}
 
-  const TypeNullability *getExprNullability(const Expr *E) const {
+  absl::Nullable<const TypeNullability *> getExprNullability(
+      absl::Nonnull<const Expr *> E) const {
     auto I = NFS.ExprToNullability.find(&dataflow::ignoreCFGOmittedNodes(*E));
     return I == NFS.ExprToNullability.end() ? nullptr : &I->second;
   }
@@ -53,7 +56,8 @@
   // the provided GetNullability.
   // Returns the (cached or computed) nullability.
   const TypeNullability &insertExprNullabilityIfAbsent(
-      const Expr *E, const std::function<TypeNullability()> &GetNullability) {
+      absl::Nonnull<const Expr *> E,
+      const std::function<TypeNullability()> &GetNullability) {
     E = &dataflow::ignoreCFGOmittedNodes(*E);
     if (auto It = NFS.ExprToNullability.find(E);
         It != NFS.ExprToNullability.end())
@@ -69,9 +73,10 @@
   // Gets the PointerValue associated with the RecordStorageLocation and
   // MethodDecl of the CallExpr, creating one if it doesn't yet exist. Requires
   // the CXXMemberCallExpr to have a supported pointer type.
-  dataflow::PointerValue *getConstMethodReturnValue(
+  absl::Nonnull<dataflow::PointerValue *> getConstMethodReturnValue(
       const dataflow::RecordStorageLocation &RecordLoc,
-      const CXXMemberCallExpr *MCE, dataflow::Environment &Env) {
+      absl::Nonnull<const CXXMemberCallExpr *> MCE,
+      dataflow::Environment &Env) {
     auto &ObjMap = ConstMethodReturnValues[&RecordLoc];
     auto it = ObjMap.find(MCE->getMethodDecl());
     if (it != ObjMap.end()) return it->second;
@@ -87,7 +92,8 @@
 
   // If nullability for the decl D has been overridden, patch N to reflect it.
   // (N is the nullability of an access to D).
-  void overrideNullabilityFromDecl(const Decl *D, TypeNullability &N) const;
+  void overrideNullabilityFromDecl(absl::Nullable<const Decl *> D,
+                                   TypeNullability &N) const;
 
   bool operator==(const PointerNullabilityLattice &Other) const { return true; }