summaryrefslogtreecommitdiff
path: root/runtime/string_builder_append.cc
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2023-11-10 09:45:51 +0100
committer VladimĂ­r Marko <vmarko@google.com> 2023-11-13 07:59:25 +0000
commit49c100b4b785c92464b283cf8ff65e187e8c7546 (patch)
treed4bd69dcc2950900f599ac86ab2fd37a673d5975 /runtime/string_builder_append.cc
parent4076d337451ab2f423c85d398b9443a4fcc819eb (diff)
Clean up `HandleScope`.
Implement `Size()` and rename `NumberOfReferences()` to `Capacity()`. Replace `Capacity()` with `Size()` where appropriate, for example to avoid visiting unused slots. Remove some obsolete dead code and move some functions from `FixedSizeHandleScope<.>` to `HandleScope`. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Change-Id: I1e49fb6144f77692ff22c6fbd0578d995b5a01f1
Diffstat (limited to 'runtime/string_builder_append.cc')
-rw-r--r--runtime/string_builder_append.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/string_builder_append.cc b/runtime/string_builder_append.cc
index 2071733a1e..9803fe3880 100644
--- a/runtime/string_builder_append.cc
+++ b/runtime/string_builder_append.cc
@@ -396,7 +396,6 @@ inline int32_t StringBuilderAppend::Builder::CalculateLengthWithFlag() {
UNREACHABLE();
}
++current_arg;
- DCHECK_LE(hs_.NumberOfReferences(), kMaxArgs);
}
if (UNLIKELY(has_fp_args)) {
@@ -430,6 +429,7 @@ inline void StringBuilderAppend::Builder::StoreData(ObjPtr<mirror::String> new_s
DCHECK_LE(f & kArgMask, static_cast<uint32_t>(Argument::kLast));
switch (static_cast<Argument>(f & kArgMask)) {
case Argument::kString: {
+ DCHECK_LT(handle_index, hs_.Size());
ObjPtr<mirror::String> str =
ObjPtr<mirror::String>::DownCast(hs_.GetReference(handle_index));
++handle_index;
@@ -485,7 +485,6 @@ inline void StringBuilderAppend::Builder::StoreData(ObjPtr<mirror::String> new_s
UNREACHABLE();
}
++current_arg;
- DCHECK_LE(handle_index, hs_.NumberOfReferences());
DCHECK_LE(fp_arg_index, std::size(converted_fp_args_));
}
DCHECK_EQ(RemainingSpace(new_string, data), 0u) << std::hex << format_;