diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-07 12:26:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-07 12:26:25 +0000 |
| commit | 085365d491ec3e271950b403af56ad20ce357570 (patch) | |
| tree | eb831b45155d1668314d3ddf54088597d51cc3d0 | |
| parent | e3963822c3fe08ab261d7b122a953a340a328a0b (diff) | |
| parent | 49b6d94dd7cd3ad73ae9d4586b3bfb540745347f (diff) | |
| download | v8-085365d491ec3e271950b403af56ad20ce357570.tar.gz | |
Merge "LiteralBuffer::ExpandBuffer always grows" into oc-mr1-dev am: 49b6d94dd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13120353
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ef9fef9c5368964ae6b8a416d97ffebb2804966
| -rw-r--r-- | src/parsing/scanner.cc | 9 | ||||
| -rw-r--r-- | src/parsing/scanner.h | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/parsing/scanner.cc b/src/parsing/scanner.cc index c1580bbe..07757ba9 100644 --- a/src/parsing/scanner.cc +++ b/src/parsing/scanner.cc @@ -67,13 +67,14 @@ Handle<String> Scanner::LiteralBuffer::Internalize(Isolate* isolate) const { } int Scanner::LiteralBuffer::NewCapacity(int min_capacity) { - int capacity = Max(min_capacity, backing_store_.length()); - int new_capacity = Min(capacity * kGrowthFactory, capacity + kMaxGrowth); - return new_capacity; + return min_capacity < (kMaxGrowth / (kGrowthFactor - 1)) + ? min_capacity * kGrowthFactor + : min_capacity + kMaxGrowth; } void Scanner::LiteralBuffer::ExpandBuffer() { - Vector<byte> new_store = Vector<byte>::New(NewCapacity(kInitialCapacity)); + int min_capacity = Max(kInitialCapacity, backing_store_.length()); + Vector<byte> new_store = Vector<byte>::New(NewCapacity(min_capacity)); MemCopy(new_store.start(), backing_store_.start(), position_); backing_store_.Dispose(); backing_store_ = new_store; diff --git a/src/parsing/scanner.h b/src/parsing/scanner.h index 9885b8ed..9cb3f117 100644 --- a/src/parsing/scanner.h +++ b/src/parsing/scanner.h @@ -419,8 +419,7 @@ class Scanner { private: static const int kInitialCapacity = 16; - static const int kGrowthFactory = 4; - static const int kMinConversionSlack = 256; + static const int kGrowthFactor = 4; static const int kMaxGrowth = 1 * MB; inline bool IsValidAscii(char code_unit) { |