From 47b34408241c00dbd6fafbfab01c206ee54d787e Mon Sep 17 00:00:00 2001
From: CEL Dev Team <cel-dev@google.com>
Date: Mon, 1 Jul 2024 06:38:55 -0700
Subject: [PATCH] Upgrade `ABSL_DCHECK` to `ABSL_CHECK` in the cache

PiperOrigin-RevId: 648351150
---
 common/types/type_cache.cc   | 28 ++++------------------------
 common/types/type_cache.h    |  8 ++++----
 common/values/value_cache.cc | 12 ++++--------
 3 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/common/types/type_cache.cc b/common/types/type_cache.cc
index 874ffef09..3ac12d838 100644
--- a/common/types/type_cache.cc
+++ b/common/types/type_cache.cc
@@ -103,33 +103,13 @@ ProcessLocalTypeCache::ProcessLocalTypeCache() {
                 StringWrapperType, TimestampType, TypeType, UintType,
                 UintWrapperType, UnknownType>(MemoryManagerRef::Unmanaged());
   dyn_list_type_ = FindListType(DynTypeView());
-  ABSL_CHECK(dyn_list_type_);  // Crash OK
+  ABSL_DCHECK(dyn_list_type_.has_value());
   dyn_dyn_map_type_ = FindMapType(DynTypeView(), DynTypeView());
-  ABSL_CHECK(dyn_dyn_map_type_);  // Crash OK
+  ABSL_DCHECK(dyn_dyn_map_type_.has_value());
   string_dyn_map_type_ = FindMapType(StringTypeView(), DynTypeView());
-  ABSL_CHECK(string_dyn_map_type_);  // Crash OK
+  ABSL_DCHECK(string_dyn_map_type_.has_value());
   dyn_optional_type_ = FindOptionalType(DynTypeView());
-  ABSL_CHECK(dyn_optional_type_);  // Crash OK
-}
-
-ListTypeView ProcessLocalTypeCache::GetDynListType() const {
-  ABSL_CHECK(dyn_list_type_);  // Crash OK
-  return *dyn_list_type_;
-}
-
-MapTypeView ProcessLocalTypeCache::GetDynDynMapType() const {
-  ABSL_CHECK(dyn_dyn_map_type_);  // Crash OK
-  return *dyn_dyn_map_type_;
-}
-
-MapTypeView ProcessLocalTypeCache::GetStringDynMapType() const {
-  ABSL_CHECK(string_dyn_map_type_);  // Crash OK
-  return *string_dyn_map_type_;
-}
-
-OptionalTypeView ProcessLocalTypeCache::GetDynOptionalType() const {
-  ABSL_CHECK(dyn_optional_type_);  // Crash OK
-  return *dyn_optional_type_;
+  ABSL_DCHECK(dyn_optional_type_.has_value());
 }
 
 template <typename... Ts>
diff --git a/common/types/type_cache.h b/common/types/type_cache.h
index 158bd22b8..8dc55839d 100644
--- a/common/types/type_cache.h
+++ b/common/types/type_cache.h
@@ -137,13 +137,13 @@ class ProcessLocalTypeCache final {
 
   SizedInputView<OptionalTypeView> OptionalTypes() const;
 
-  ListTypeView GetDynListType() const;
+  ListTypeView GetDynListType() const { return *dyn_list_type_; }
 
-  MapTypeView GetDynDynMapType() const;
+  MapTypeView GetDynDynMapType() const { return *dyn_dyn_map_type_; }
 
-  MapTypeView GetStringDynMapType() const;
+  MapTypeView GetStringDynMapType() const { return *string_dyn_map_type_; }
 
-  OptionalTypeView GetDynOptionalType() const;
+  OptionalTypeView GetDynOptionalType() const { return *dyn_optional_type_; }
 
  private:
   friend class absl::NoDestructor<ProcessLocalTypeCache>;
diff --git a/common/values/value_cache.cc b/common/values/value_cache.cc
index dc60d6cce..b24db1cac 100644
--- a/common/values/value_cache.cc
+++ b/common/values/value_cache.cc
@@ -62,7 +62,6 @@ absl::optional<ParsedListValueView> ProcessLocalValueCache::GetEmptyListValue(
 }
 
 ParsedListValueView ProcessLocalValueCache::GetEmptyDynListValue() const {
-  ABSL_CHECK(dyn_list_value_);  // Crash OK
   return *dyn_list_value_;
 }
 
@@ -75,12 +74,10 @@ absl::optional<ParsedMapValueView> ProcessLocalValueCache::GetEmptyMapValue(
 }
 
 ParsedMapValueView ProcessLocalValueCache::GetEmptyDynDynMapValue() const {
-  ABSL_CHECK(dyn_dyn_map_value_);  // Crash OK
   return *dyn_dyn_map_value_;
 }
 
 ParsedMapValueView ProcessLocalValueCache::GetEmptyStringDynMapValue() const {
-  ABSL_CHECK(string_dyn_map_value_);  // Crash OK
   return *string_dyn_map_value_;
 }
 absl::optional<OptionalValueView> ProcessLocalValueCache::GetEmptyOptionalValue(
@@ -93,7 +90,6 @@ absl::optional<OptionalValueView> ProcessLocalValueCache::GetEmptyOptionalValue(
 }
 
 OptionalValueView ProcessLocalValueCache::GetEmptyDynOptionalValue() const {
-  ABSL_CHECK(dyn_optional_value_);  // Crash OK
   return *dyn_optional_value_;
 }
 
@@ -138,16 +134,16 @@ ProcessLocalValueCache::ProcessLocalValueCache()
   }
   dyn_list_value_ =
       GetEmptyListValue(ProcessLocalTypeCache::Get()->GetDynListType());
-  ABSL_CHECK(dyn_list_value_);  // Crash OK
+  ABSL_DCHECK(dyn_list_value_.has_value());
   dyn_dyn_map_value_ =
       GetEmptyMapValue(ProcessLocalTypeCache::Get()->GetDynDynMapType());
-  ABSL_CHECK(dyn_dyn_map_value_);  // Crash OK
+  ABSL_DCHECK(dyn_dyn_map_value_.has_value());
   string_dyn_map_value_ =
       GetEmptyMapValue(ProcessLocalTypeCache::Get()->GetStringDynMapType());
-  ABSL_CHECK(string_dyn_map_value_);  // Crash OK
+  ABSL_DCHECK(string_dyn_map_value_.has_value());
   dyn_optional_value_ =
       GetEmptyOptionalValue(ProcessLocalTypeCache::Get()->GetDynOptionalType());
-  ABSL_CHECK(dyn_optional_value_);  // Crash OK
+  ABSL_DCHECK(dyn_optional_value_.has_value());
 }
 
 }  // namespace cel::common_internal