mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
6b5eb1a101
High level, replacing `Id::Invalid` with `Id::None` and `Id::is_valid` with `Id::has_value` for clarity, as discussed [here](https://discord.com/channels/655572317891461132/655578254970716160/1331664574545395794). The `IntId` refactoring is needed together with `AnyIdBase` because it's also used with `ValueStore`. Note, trying to be careful not to rewrite `EnumBase::InvalidIndex`, or `is_valid` in general (e.g., `IdKind::is_valid`). I've tried to sequence commits here: 1. Automatic replacements: - `((?:Id|Index)(?: |::|\(|Base(?:\(|::)))Invalid((?:Index)?\W)` -> `$1None$2` - `<invalid>` -> `<none>` - `InvalidNodeId` -> `NoneNodeId` - `/\*invalid\*/` -> `/*none*/` - `id((?:_|\(\))(?:\.|->))is_valid` -> `id$1has_value` 2. Manual edits: - In `int.h` and `int_test.cpp` - `IntT` has `is_value`, which I'm renaming to `is_embedded_value`. - Manual edits to comments in this file. - `AnyIdBase` and `IdBase` - Declaration of `is_valid` -> `has_value`, `InvalidIndex` -> `NoneIndex`. - In `ids.h` and `ids.cpp` - `is_valid` -> `has_value` - `// An explicitly invalid ID.` -> `// An ID with no value.`; similar for index - Various math on `InvalidIndex` -> `NoneIndex` - Various mentions of "valid" in comments - In `value_store.h`, for `IdT::Invalid`, plus one comment - In `impl.h` and `tokenized_buffer.h`, we had different initialization of `::None` values (versus `ids.h` syntax) that I fixed manually. - Spot checks to compile - Particularly where `is_valid` replacements didn't catch spots due to different naming. 3. Autoupdate tests 4. verbose.carbon (NOAUTOUPDATE) 5. Comment spot checks Note there are probably other mentions of "Invalid" that should be swept up, but I'd like to argue for merging and separating out remaining cleanup since this is so sweeping (and likely to hit merge conflicts from churn). We'll probably have lingering mentions of "invalid" for a bit regardless, just because there are uses of "invalid" in non-Id APIs.
67 lines
2.2 KiB
C++
67 lines
2.2 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/base/int.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto IntStore::CanonicalBitWidth(int significant_bits) -> int {
|
|
// For larger integers, we store them in as a signed APInt with a canonical
|
|
// width that is the smallest multiple of the word type's bits, but no
|
|
// smaller than a minimum of 64 bits to avoid spurious resizing of the most
|
|
// common cases (<= 64 bits).
|
|
static constexpr int WordWidth = llvm::APInt::APINT_BITS_PER_WORD;
|
|
|
|
return std::max<int>(
|
|
MinAPWidth, ((significant_bits + WordWidth - 1) / WordWidth) * WordWidth);
|
|
}
|
|
|
|
auto IntStore::CanonicalizeSigned(llvm::APInt value) -> llvm::APInt {
|
|
return value.sextOrTrunc(CanonicalBitWidth(value.getSignificantBits()));
|
|
}
|
|
|
|
auto IntStore::CanonicalizeUnsigned(llvm::APInt value) -> llvm::APInt {
|
|
// We need the width to include a zero sign bit as we canonicalize to a
|
|
// signed representation.
|
|
return value.zextOrTrunc(CanonicalBitWidth(value.getActiveBits() + 1));
|
|
}
|
|
|
|
auto IntStore::AddLarge(int64_t value) -> IntId {
|
|
auto ap_id =
|
|
values_.Add(llvm::APInt(CanonicalBitWidth(64), value, /*isSigned=*/true));
|
|
return MakeIndexOrNone(ap_id.index);
|
|
}
|
|
|
|
auto IntStore::AddSignedLarge(llvm::APInt value) -> IntId {
|
|
auto ap_id = values_.Add(CanonicalizeSigned(value));
|
|
return MakeIndexOrNone(ap_id.index);
|
|
}
|
|
|
|
auto IntStore::AddUnsignedLarge(llvm::APInt value) -> IntId {
|
|
auto ap_id = values_.Add(CanonicalizeUnsigned(value));
|
|
return MakeIndexOrNone(ap_id.index);
|
|
}
|
|
|
|
auto IntStore::LookupLarge(int64_t value) const -> IntId {
|
|
auto ap_id = values_.Lookup(
|
|
llvm::APInt(CanonicalBitWidth(64), value, /*isSigned=*/true));
|
|
return MakeIndexOrNone(ap_id.index);
|
|
}
|
|
|
|
auto IntStore::LookupSignedLarge(llvm::APInt value) const -> IntId {
|
|
auto ap_id = values_.Lookup(CanonicalizeSigned(value));
|
|
return MakeIndexOrNone(ap_id.index);
|
|
}
|
|
|
|
auto IntStore::OutputYaml() const -> Yaml::OutputMapping {
|
|
return values_.OutputYaml();
|
|
}
|
|
|
|
auto IntStore::CollectMemUsage(MemUsage& mem_usage, llvm::StringRef label) const
|
|
-> void {
|
|
mem_usage.Collect(std::string(label), values_);
|
|
}
|
|
|
|
} // namespace Carbon
|