commit 1d41c112731d4cfa9d9905184621c6647f518d2b
author Dani Ferreira Franco Moura <danimoura@google.com> Wed Dec 21 08:43:32 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Dec 21 08:44:07 2022 -0800
tree 2cbd5aeb74a8175dc006e0ce9a1aeeefc77b8033
parent ec895669ade6c2427aea9c82b9553154f722be5d

Remove unused arguments in function that get an expression's nullability.

Previously, the getNullability() function in LLVM required an AST Context, but this context was never used. We have thus removed this argument from getNullability() upstream. This CL is the corresponding change in Crubit.

PiperOrigin-RevId: 496930964

nullability_verification/pointer_nullability_analysis.cc

diff --git a/nullability_verification/pointer_nullability_analysis.cc b/nullability_verification/pointer_nullability_analysis.cc
index 6a8c2db..2ce3a38 100644
--- a/nullability_verification/pointer_nullability_analysis.cc
+++ b/nullability_verification/pointer_nullability_analysis.cc
@@ -326,10 +326,10 @@
   return NullabilityAnnotations[0];
 }
 
-NullabilityKind getPointerNullability(const Expr* E, ASTContext& Ctx,
+NullabilityKind getPointerNullability(const Expr* E,
                                       PointerNullabilityAnalysis::Lattice& L) {
   QualType ExprType = E->getType();
-  Optional<NullabilityKind> Nullability = ExprType->getNullability(Ctx);
+  Optional<NullabilityKind> Nullability = ExprType->getNullability();
 
   // If the expression's type does not contain nullability information, it may
   // be a template instantiation. Look up the nullability in the
@@ -352,10 +352,10 @@
   return Nullability.value_or(NullabilityKind::Unspecified);
 }
 
-void initPointerFromAnnotations(PointerValue& PointerVal, const Expr* E,
-                                TransferState<PointerNullabilityLattice>& State,
-                                ASTContext& Ctx) {
-  NullabilityKind Nullability = getPointerNullability(E, Ctx, State.Lattice);
+void initPointerFromAnnotations(
+    PointerValue& PointerVal, const Expr* E,
+    TransferState<PointerNullabilityLattice>& State) {
+  NullabilityKind Nullability = getPointerNullability(E, State.Lattice);
   switch (Nullability) {
     case NullabilityKind::NonNull:
       initNotNullPointer(PointerVal, State.Env);
@@ -388,8 +388,7 @@
                      const MatchFinder::MatchResult& Result,
                      TransferState<PointerNullabilityLattice>& State) {
   if (auto* PointerVal = getPointerValueFromExpr(PointerExpr, State.Env)) {
-    initPointerFromAnnotations(*PointerVal, PointerExpr, State,
-                               *Result.Context);
+    initPointerFromAnnotations(*PointerVal, PointerExpr, State);
   }
 }
 
@@ -464,7 +463,7 @@
     State.Env.setValue(CallExprLoc, *PointerVal);
     State.Env.setStorageLocation(*CallExpr, CallExprLoc);
   }
-  initPointerFromAnnotations(*PointerVal, CallExpr, State, *Result.Context);
+  initPointerFromAnnotations(*PointerVal, CallExpr, State);
 }
 
 void transferDeclRefExpr(const DeclRefExpr* DRE,