Bump abseil and protobuf versions.

Use the `absl_nullable` style of nullability annotations.

PiperOrigin-RevId: 788564038

Author: jnthntatum

MODULE.bazel

@@ -33,12 +33,12 @@ bazel_dep(
 )
 bazel_dep(
     name = "protobuf",
-    version = "28.3",
+    version = "30.2",
     repo_name = "com_google_protobuf",
 )
 bazel_dep(
     name = "abseil-cpp",
-    version = "20250127.1",
+    version = "20250512.1",
     repo_name = "com_google_absl",
 )
 bazel_dep(

checker/internal/builtins_arena.cc

@@ -20,7 +20,7 @@
 
 namespace cel::checker_internal {
 
-google::protobuf::Arena* ABSL_NONNULL BuiltinsArena() {
+google::protobuf::Arena* absl_nonnull BuiltinsArena() {
   static absl::NoDestructor<google::protobuf::Arena> kArena;
   return &(*kArena);
 }

checker/internal/builtins_arena.h

@@ -22,7 +22,7 @@ namespace cel::checker_internal {
 
 // Shared arena for builtin types that are shared across all type checker
 // instances.
-google::protobuf::Arena* ABSL_NONNULL BuiltinsArena();
+google::protobuf::Arena* absl_nonnull BuiltinsArena();
 
 }  // namespace cel::checker_internal
 

checker/internal/type_check_env.cc

@@ -33,7 +33,7 @@
 
 namespace cel::checker_internal {
 
-const VariableDecl* ABSL_NULLABLE TypeCheckEnv::LookupVariable(
+const VariableDecl* absl_nullable TypeCheckEnv::LookupVariable(
     absl::string_view name) const {
   const TypeCheckEnv* scope = this;
   while (scope != nullptr) {
@@ -45,7 +45,7 @@ const VariableDecl* ABSL_NULLABLE TypeCheckEnv::LookupVariable(
   return nullptr;
 }
 
-const FunctionDecl* ABSL_NULLABLE TypeCheckEnv::LookupFunction(
+const FunctionDecl* absl_nullable TypeCheckEnv::LookupFunction(
     absl::string_view name) const {
   const TypeCheckEnv* scope = this;
   while (scope != nullptr) {
@@ -61,12 +61,12 @@ absl::StatusOr<absl::optional<Type>> TypeCheckEnv::LookupTypeName(
     absl::string_view name) const {
   {
     // Check the descriptor pool first, then fallback to custom type providers.
-    const google::protobuf::Descriptor* ABSL_NULLABLE descriptor =
+    const google::protobuf::Descriptor* absl_nullable descriptor =
         descriptor_pool_->FindMessageTypeByName(name);
     if (descriptor != nullptr) {
       return Type::Message(descriptor);
     }
-    const google::protobuf::EnumDescriptor* ABSL_NULLABLE enum_descriptor =
+    const google::protobuf::EnumDescriptor* absl_nullable enum_descriptor =
         descriptor_pool_->FindEnumTypeByName(name);
     if (enum_descriptor != nullptr) {
       return Type::Enum(enum_descriptor);
@@ -90,10 +90,10 @@ absl::StatusOr<absl::optional<VariableDecl>> TypeCheckEnv::LookupEnumConstant(
     absl::string_view type, absl::string_view value) const {
   {
     // Check the descriptor pool first, then fallback to custom type providers.
-    const google::protobuf::EnumDescriptor* ABSL_NULLABLE enum_descriptor =
+    const google::protobuf::EnumDescriptor* absl_nullable enum_descriptor =
         descriptor_pool_->FindEnumTypeByName(type);
     if (enum_descriptor != nullptr) {
-      const google::protobuf::EnumValueDescriptor* ABSL_NULLABLE enum_value_descriptor =
+      const google::protobuf::EnumValueDescriptor* absl_nullable enum_value_descriptor =
           enum_descriptor->FindValueByName(value);
       if (enum_value_descriptor == nullptr) {
         return absl::nullopt;
@@ -131,7 +131,7 @@ absl::StatusOr<absl::optional<VariableDecl>> TypeCheckEnv::LookupEnumConstant(
 }
 
 absl::StatusOr<absl::optional<VariableDecl>> TypeCheckEnv::LookupTypeConstant(
-    google::protobuf::Arena* ABSL_NONNULL arena, absl::string_view name) const {
+    google::protobuf::Arena* absl_nonnull arena, absl::string_view name) const {
   CEL_ASSIGN_OR_RETURN(absl::optional<Type> type, LookupTypeName(name));
   if (type.has_value()) {
     return MakeVariableDecl(std::string(type->name()), TypeType(arena, *type));
@@ -151,10 +151,10 @@ absl::StatusOr<absl::optional<StructTypeField>> TypeCheckEnv::LookupStructField(
     absl::string_view type_name, absl::string_view field_name) const {
   {
     // Check the descriptor pool first, then fallback to custom type providers.
-    const google::protobuf::Descriptor* ABSL_NULLABLE descriptor =
+    const google::protobuf::Descriptor* absl_nullable descriptor =
         descriptor_pool_->FindMessageTypeByName(type_name);
     if (descriptor != nullptr) {
-      const google::protobuf::FieldDescriptor* ABSL_NULLABLE field_descriptor =
+      const google::protobuf::FieldDescriptor* absl_nullable field_descriptor =
           descriptor->FindFieldByName(field_name);
       if (field_descriptor == nullptr) {
         field_descriptor = descriptor_pool_->FindExtensionByPrintableName(
@@ -185,7 +185,7 @@ absl::StatusOr<absl::optional<StructTypeField>> TypeCheckEnv::LookupStructField(
   return absl::nullopt;
 }
 
-const VariableDecl* ABSL_NULLABLE VariableScope::LookupVariable(
+const VariableDecl* absl_nullable VariableScope::LookupVariable(
     absl::string_view name) const {
   const VariableScope* scope = this;
   while (scope != nullptr) {

checker/internal/type_check_env.h

@@ -64,16 +64,16 @@ class VariableScope {
     return absl::WrapUnique(new VariableScope(*env_, this));
   }
 
-  const VariableDecl* ABSL_NULLABLE LookupVariable(
+  const VariableDecl* absl_nullable LookupVariable(
       absl::string_view name) const;
 
  private:
   VariableScope(const TypeCheckEnv& env ABSL_ATTRIBUTE_LIFETIME_BOUND,
                 const VariableScope* parent ABSL_ATTRIBUTE_LIFETIME_BOUND)
       : env_(&env), parent_(parent) {}
 
-  const TypeCheckEnv* ABSL_NONNULL env_;
-  const VariableScope* ABSL_NULLABLE parent_;
+  const TypeCheckEnv* absl_nonnull env_;
+  const VariableScope* absl_nullable parent_;
   absl::flat_hash_map<std::string, VariableDecl> variables_;
 };
 
@@ -85,18 +85,18 @@ class VariableScope {
 // This class is thread-compatible.
 class TypeCheckEnv {
  private:
-  using VariableDeclPtr = const VariableDecl* ABSL_NONNULL;
-  using FunctionDeclPtr = const FunctionDecl* ABSL_NONNULL;
+  using VariableDeclPtr = const VariableDecl* absl_nonnull;
+  using FunctionDeclPtr = const FunctionDecl* absl_nonnull;
 
  public:
   explicit TypeCheckEnv(
-      ABSL_NONNULL std::shared_ptr<const google::protobuf::DescriptorPool>
+      absl_nonnull std::shared_ptr<const google::protobuf::DescriptorPool>
           descriptor_pool)
       : descriptor_pool_(std::move(descriptor_pool)),
         container_(""),
         parent_(nullptr) {}
 
-  TypeCheckEnv(ABSL_NONNULL std::shared_ptr<const google::protobuf::DescriptorPool>
+  TypeCheckEnv(absl_nonnull std::shared_ptr<const google::protobuf::DescriptorPool>
                    descriptor_pool,
                std::shared_ptr<google::protobuf::Arena> arena)
       : descriptor_pool_(std::move(descriptor_pool)),
@@ -166,16 +166,16 @@ class TypeCheckEnv {
     functions_[decl.name()] = std::move(decl);
   }
 
-  const TypeCheckEnv* ABSL_NULLABLE parent() const { return parent_; }
+  const TypeCheckEnv* absl_nullable parent() const { return parent_; }
   void set_parent(TypeCheckEnv* parent) { parent_ = parent; }
 
   // Returns the declaration for the given name if it is found in the current
   // or any parent scope.
   // Note: the returned declaration ptr is only valid as long as no changes are
   // made to the environment.
-  const VariableDecl* ABSL_NULLABLE LookupVariable(
+  const VariableDecl* absl_nullable LookupVariable(
       absl::string_view name) const;
-  const FunctionDecl* ABSL_NULLABLE LookupFunction(
+  const FunctionDecl* absl_nullable LookupFunction(
       absl::string_view name) const;
 
   absl::StatusOr<absl::optional<Type>> LookupTypeName(
@@ -185,7 +185,7 @@ class TypeCheckEnv {
       absl::string_view type_name, absl::string_view field_name) const;
 
   absl::StatusOr<absl::optional<VariableDecl>> LookupTypeConstant(
-      google::protobuf::Arena* ABSL_NONNULL arena, absl::string_view type_name) const;
+      google::protobuf::Arena* absl_nonnull arena, absl::string_view type_name) const;
 
   TypeCheckEnv MakeExtendedEnvironment() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
     return TypeCheckEnv(this);
@@ -194,24 +194,24 @@ class TypeCheckEnv {
     return VariableScope(*this);
   }
 
-  const google::protobuf::DescriptorPool* ABSL_NONNULL descriptor_pool() const {
+  const google::protobuf::DescriptorPool* absl_nonnull descriptor_pool() const {
     return descriptor_pool_.get();
   }
 
  private:
-  explicit TypeCheckEnv(const TypeCheckEnv* ABSL_NONNULL parent)
+  explicit TypeCheckEnv(const TypeCheckEnv* absl_nonnull parent)
       : descriptor_pool_(parent->descriptor_pool_),
         container_(parent != nullptr ? parent->container() : ""),
         parent_(parent) {}
 
   absl::StatusOr<absl::optional<VariableDecl>> LookupEnumConstant(
       absl::string_view type, absl::string_view value) const;
 
-  ABSL_NONNULL std::shared_ptr<const google::protobuf::DescriptorPool> descriptor_pool_;
+  absl_nonnull std::shared_ptr<const google::protobuf::DescriptorPool> descriptor_pool_;
   // If set, an arena was needed to allocate types in the environment.
-  ABSL_NULLABLE std::shared_ptr<const google::protobuf::Arena> arena_;
+  absl_nullable std::shared_ptr<const google::protobuf::Arena> arena_;
   std::string container_;
-  const TypeCheckEnv* ABSL_NULLABLE parent_;
+  const TypeCheckEnv* absl_nullable parent_;
 
   // Maps fully qualified names to declarations.
   absl::flat_hash_map<std::string, VariableDecl> variables_;

checker/internal/type_checker_builder_impl.cc

@@ -83,7 +83,7 @@ absl::Status CheckStdMacroOverlap(const FunctionDecl& decl) {
 }
 
 absl::Status AddContextDeclarationVariables(
-    const google::protobuf::Descriptor* ABSL_NONNULL descriptor, TypeCheckEnv& env) {
+    const google::protobuf::Descriptor* absl_nonnull descriptor, TypeCheckEnv& env) {
   for (int i = 0; i < descriptor->field_count(); i++) {
     const google::protobuf::FieldDescriptor* proto_field = descriptor->field(i);
     MessageTypeField cel_field(proto_field);

checker/internal/type_checker_builder_impl.h

@@ -45,7 +45,7 @@ class TypeCheckerBuilderImpl;
 class TypeCheckerBuilderImpl : public TypeCheckerBuilder {
  public:
   TypeCheckerBuilderImpl(
-      ABSL_NONNULL std::shared_ptr<const google::protobuf::DescriptorPool>
+      absl_nonnull std::shared_ptr<const google::protobuf::DescriptorPool>
           descriptor_pool,
       const CheckerOptions& options)
       : options_(options),
@@ -78,14 +78,14 @@ class TypeCheckerBuilderImpl : public TypeCheckerBuilder {
 
   const CheckerOptions& options() const override { return options_; }
 
-  google::protobuf::Arena* ABSL_NONNULL arena() override {
+  google::protobuf::Arena* absl_nonnull arena() override {
     if (arena_ == nullptr) {
       arena_ = std::make_shared<google::protobuf::Arena>();
     }
     return arena_.get();
   }
 
-  const google::protobuf::DescriptorPool* ABSL_NONNULL descriptor_pool() const override {
+  const google::protobuf::DescriptorPool* absl_nonnull descriptor_pool() const override {
     return descriptor_pool_.get();
   }
 
@@ -120,7 +120,7 @@ class TypeCheckerBuilderImpl : public TypeCheckerBuilder {
   };
 
   absl::Status BuildLibraryConfig(const CheckerLibrary& library,
-                                  ConfigRecord* ABSL_NONNULL config);
+                                  ConfigRecord* absl_nonnull config);
 
   absl::Status ApplyConfig(ConfigRecord config, const TypeCheckerSubset* subset,
                            TypeCheckEnv& env);
@@ -131,7 +131,7 @@ class TypeCheckerBuilderImpl : public TypeCheckerBuilder {
   ConfigRecord default_config_;
   // Active target for configuration changes.
   // This is used to track which library the change is made on behalf of.
-  ConfigRecord* ABSL_NONNULL target_config_;
+  ConfigRecord* absl_nonnull target_config_;
   std::shared_ptr<const google::protobuf::DescriptorPool> descriptor_pool_;
   std::shared_ptr<google::protobuf::Arena> arena_;
   std::vector<CheckerLibrary> libraries_;

checker/internal/type_checker_impl.cc

@@ -251,7 +251,7 @@ class ResolveVisitor : public AstVisitorBase {
                  const TypeCheckEnv& env, const AstImpl& ast,
                  TypeInferenceContext& inference_context,
                  std::vector<TypeCheckIssue>& issues,
-                 google::protobuf::Arena* ABSL_NONNULL arena)
+                 google::protobuf::Arena* absl_nonnull arena)
       : container_(container),
         namespace_generator_(std::move(namespace_generator)),
         env_(&env),
@@ -358,7 +358,7 @@ class ResolveVisitor : public AstVisitorBase {
 
   // Resolves the function call shape (i.e. the number of arguments and call
   // style) for the given function call.
-  const VariableDecl* ABSL_NULLABLE LookupIdentifier(absl::string_view name);
+  const VariableDecl* absl_nullable LookupIdentifier(absl::string_view name);
 
   // Resolves the applicable function overloads for the given function call.
   //
@@ -465,12 +465,12 @@ class ResolveVisitor : public AstVisitorBase {
 
   absl::string_view container_;
   NamespaceGenerator namespace_generator_;
-  const TypeCheckEnv* ABSL_NONNULL env_;
-  TypeInferenceContext* ABSL_NONNULL inference_context_;
-  std::vector<TypeCheckIssue>* ABSL_NONNULL issues_;
-  const ast_internal::AstImpl* ABSL_NONNULL ast_;
+  const TypeCheckEnv* absl_nonnull env_;
+  TypeInferenceContext* absl_nonnull inference_context_;
+  std::vector<TypeCheckIssue>* absl_nonnull issues_;
+  const ast_internal::AstImpl* absl_nonnull ast_;
   VariableScope root_scope_;
-  google::protobuf::Arena* ABSL_NONNULL arena_;
+  google::protobuf::Arena* absl_nonnull arena_;
 
   // state tracking for the traversal.
   const VariableScope* current_scope_;
@@ -979,7 +979,7 @@ void ResolveVisitor::ResolveFunctionOverloads(const Expr& expr,
   types_[&expr] = resolution->result_type;
 }
 
-const VariableDecl* ABSL_NULLABLE ResolveVisitor::LookupIdentifier(
+const VariableDecl* absl_nullable ResolveVisitor::LookupIdentifier(
     absl::string_view name) {
   if (const VariableDecl* decl = current_scope_->LookupVariable(name);
       decl != nullptr) {
@@ -1033,7 +1033,7 @@ void ResolveVisitor::ResolveQualifiedIdentifier(
     return;
   }
 
-  const VariableDecl* ABSL_NULLABLE decl = nullptr;
+  const VariableDecl* absl_nullable decl = nullptr;
   int segment_index_out = -1;
   namespace_generator_.GenerateCandidates(
       qualifiers, [&decl, &segment_index_out, this](absl::string_view candidate,

checker/internal/type_checker_impl_test.cc

@@ -102,7 +102,7 @@ void AbslStringify(Sink& sink, const TypeCheckIssue& issue) {
 namespace checker_internal {
 namespace {
 
-google::protobuf::Arena* ABSL_NONNULL TestTypeArena() {
+google::protobuf::Arena* absl_nonnull TestTypeArena() {
   static absl::NoDestructor<google::protobuf::Arena> kArena;
   return &(*kArena);
 }
@@ -161,7 +161,7 @@ MATCHER_P2(IsFunctionReference, fn_name, overloads, "") {
   return reference.name() == fn_name && got_overload_set == want_overload_set;
 }
 
-absl::Status RegisterMinimalBuiltins(google::protobuf::Arena* ABSL_NONNULL arena,
+absl::Status RegisterMinimalBuiltins(google::protobuf::Arena* absl_nonnull arena,
                                      TypeCheckEnv& env) {
   Type list_of_a = ListType(arena, TypeParamType("A"));
 

checker/type_checker_builder.h

@@ -146,10 +146,10 @@ class TypeCheckerBuilder {
   // that will be used by the TypeChecker being built.
   //
   // On Build(), the arena is transferred to the TypeChecker being built.
-  virtual google::protobuf::Arena* ABSL_NONNULL arena() = 0;
+  virtual google::protobuf::Arena* absl_nonnull arena() = 0;
 
   // The configured descriptor pool.
-  virtual const google::protobuf::DescriptorPool* ABSL_NONNULL descriptor_pool()
+  virtual const google::protobuf::DescriptorPool* absl_nonnull descriptor_pool()
       const = 0;
 };