Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Upgrade ABSL_DCHECK to ABSL_CHECK in the cache #805

Merged
merged 1 commit into from
Jul 1, 2024
Merged

Upgrade ABSL_DCHECK to ABSL_CHECK in the cache #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions common/types/type_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions common/types/type_cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
12 changes: 4 additions & 8 deletions common/values/value_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ absl::optional<ParsedListValueView> ProcessLocalValueCache::GetEmptyListValue(
}

ParsedListValueView ProcessLocalValueCache::GetEmptyDynListValue() const {
ABSL_CHECK(dyn_list_value_); // Crash OK
return *dyn_list_value_;
}

Expand All @@ -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(
Expand All @@ -93,7 +90,6 @@ absl::optional<OptionalValueView> ProcessLocalValueCache::GetEmptyOptionalValue(
}

OptionalValueView ProcessLocalValueCache::GetEmptyDynOptionalValue() const {
ABSL_CHECK(dyn_optional_value_); // Crash OK
return *dyn_optional_value_;
}

Expand Down Expand Up @@ -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