Skip to content

Improve CHECK-failure when passing a negative id to a ValueStore #6370 #6392

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2025
Merged

Improve CHECK-failure when passing a negative id to a ValueStore #6370 #6392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f62cce7
Improve CHECK-failure when passing a negative id to a ValueStore #6370
dwblaikie Nov 18, 2025
36bb9de
Put CHECKs down in the tag for more robustness
dwblaikie Nov 19, 2025
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
6 changes: 3 additions & 3 deletions toolchain/base/fixed_size_value_store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,22 @@ class FixedSizeValueStore {

// Sets the value for an ID.
auto Set(IdT id, ValueType value) -> void {
CARBON_DCHECK(id.index >= 0, "{0}", id);
auto index = tag_.Remove(id.index);
CARBON_DCHECK(index >= 0, "{0}", id);
values_[index] = value;
}

// Returns a mutable value for an ID.
auto Get(IdT id) -> RefType {
CARBON_DCHECK(id.index >= 0, "{0}", id);
auto index = tag_.Remove(id.index);
CARBON_DCHECK(index >= 0, "{0}", id);
return values_[index];
}

// Returns the value for an ID.
auto Get(IdT id) const -> ConstRefType {
CARBON_DCHECK(id.index >= 0, "{0}", id);
auto index = tag_.Remove(id.index);
CARBON_DCHECK(index >= 0, "{0}", id);
return values_[index];
}

Expand Down
2 changes: 1 addition & 1 deletion toolchain/base/relational_value_store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ class RelationalValueStore {

// Returns a value for an ID.
auto Get(IdT id) const -> ConstRefType {
CARBON_DCHECK(id.index >= 0, "{0}", id);
auto index = related_store_->GetIdTag().Remove(id.index);
CARBON_DCHECK(index >= 0, "{0}", id);
return *values_[index];
}

Expand Down
10 changes: 7 additions & 3 deletions toolchain/base/value_store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,18 @@ struct IdTag {
}

auto Apply(int32_t index) const -> int32_t {
CARBON_DCHECK(index >= 0, "{0}", index);
if (index < initial_reserved_ids_) {
return index;
}
// TODO: Assert that id_tag_ doesn't have the second highest bit set.
return index ^ id_tag_;
auto tagged_index = index ^ id_tag_;
CARBON_DCHECK(tagged_index >= 0, "{0}", tagged_index);
return tagged_index;
}

auto Remove(int32_t tagged_index) const -> int32_t {
CARBON_DCHECK(tagged_index >= 0, "{0}", tagged_index);
if (!HasTag(tagged_index)) {
CARBON_DCHECK(tagged_index < initial_reserved_ids_,
"This untagged index is outside the initial reserved ids "
Expand Down Expand Up @@ -226,11 +230,11 @@ class ValueStore
auto GetWithDefault(IdType id, //
ConstRefType default_value [[clang::lifetimebound]]) const
-> ConstRefType {
CARBON_DCHECK(id.index >= 0, "{0}", id);
auto index = tag_.Remove(id.index);
if (index >= size_) {
return default_value;
}
CARBON_DCHECK(index >= 0, "{0}", id);
auto [chunk_index, pos] = RawIndexToChunkIndices(index);
return chunks_[chunk_index].Get(pos);
}
Expand Down Expand Up @@ -325,8 +329,8 @@ class ValueStore

auto GetIdTag() const -> IdTag { return tag_; }
auto GetRawIndex(IdT id) const -> int32_t {
CARBON_DCHECK(id.index >= 0, "{0}", index);
auto index = tag_.Remove(id.index);
CARBON_DCHECK(index >= 0, "{0}", index);
#ifndef NDEBUG
if (index >= size_) {
// Attempt to decompose id.index to include extra detail in the check
Expand Down
Loading