Upgrade ABSL_DCHECK to ABSL_CHECK in the cache

PiperOrigin-RevId: 647705533
google · Jun 28, 2024 · bbed662 · bbed662
1 parent df8b15a
commit bbed662
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 12 deletions.
diff --git a/common/types/type_cache.cc b/common/types/type_cache.cc
@@ -103,13 +103,33 @@ ProcessLocalTypeCache::ProcessLocalTypeCache() {
                 StringWrapperType, TimestampType, TypeType, UintType,
                 UintWrapperType, UnknownType>(MemoryManagerRef::Unmanaged());
   dyn_list_type_ = FindListType(DynTypeView());
-  ABSL_DCHECK(dyn_list_type_.has_value());
+  ABSL_CHECK(dyn_list_type_);  // Crash OK
   dyn_dyn_map_type_ = FindMapType(DynTypeView(), DynTypeView());
-  ABSL_DCHECK(dyn_dyn_map_type_.has_value());
+  ABSL_CHECK(dyn_dyn_map_type_);  // Crash OK
   string_dyn_map_type_ = FindMapType(StringTypeView(), DynTypeView());
-  ABSL_DCHECK(string_dyn_map_type_.has_value());
+  ABSL_CHECK(string_dyn_map_type_);  // Crash OK
   dyn_optional_type_ = FindOptionalType(DynTypeView());
-  ABSL_DCHECK(dyn_optional_type_.has_value());
+  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_;
 }
 
 template <typename... Ts>

diff --git 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 { return *dyn_list_type_; }
+  ListTypeView GetDynListType() const;
 
-  MapTypeView GetDynDynMapType() const { return *dyn_dyn_map_type_; }
+  MapTypeView GetDynDynMapType() const;
 
-  MapTypeView GetStringDynMapType() const { return *string_dyn_map_type_; }
+  MapTypeView GetStringDynMapType() const;
 
-  OptionalTypeView GetDynOptionalType() const { return *dyn_optional_type_; }
+  OptionalTypeView GetDynOptionalType() const;
 
  private:
   friend class absl::NoDestructor<ProcessLocalTypeCache>;

diff --git a/common/values/value_cache.cc b/common/values/value_cache.cc
@@ -62,6 +62,7 @@ absl::optional<ParsedListValueView> ProcessLocalValueCache::GetEmptyListValue(
 }
 
 ParsedListValueView ProcessLocalValueCache::GetEmptyDynListValue() const {
+  ABSL_CHECK(dyn_list_value_);  // Crash OK
   return *dyn_list_value_;
 }
 
@@ -74,10 +75,12 @@ 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(
@@ -90,6 +93,7 @@ absl::optional<OptionalValueView> ProcessLocalValueCache::GetEmptyOptionalValue(
 }
 
 OptionalValueView ProcessLocalValueCache::GetEmptyDynOptionalValue() const {
+  ABSL_CHECK(dyn_optional_value_);  // Crash OK
   return *dyn_optional_value_;
 }
 
@@ -134,16 +138,16 @@ ProcessLocalValueCache::ProcessLocalValueCache()
   }
   dyn_list_value_ =
       GetEmptyListValue(ProcessLocalTypeCache::Get()->GetDynListType());
-  ABSL_DCHECK(dyn_list_value_.has_value());
+  ABSL_CHECK(dyn_list_value_);  // Crash OK
   dyn_dyn_map_value_ =
       GetEmptyMapValue(ProcessLocalTypeCache::Get()->GetDynDynMapType());
-  ABSL_DCHECK(dyn_dyn_map_value_.has_value());
+  ABSL_CHECK(dyn_dyn_map_value_);  // Crash OK
   string_dyn_map_value_ =
       GetEmptyMapValue(ProcessLocalTypeCache::Get()->GetStringDynMapType());
-  ABSL_DCHECK(string_dyn_map_value_.has_value());
+  ABSL_CHECK(string_dyn_map_value_);  // Crash OK
   dyn_optional_value_ =
       GetEmptyOptionalValue(ProcessLocalTypeCache::Get()->GetDynOptionalType());
-  ABSL_DCHECK(dyn_optional_value_.has_value());
+  ABSL_CHECK(dyn_optional_value_);  // Crash OK
 }
 
 }  // namespace cel::common_internal