diff options
| author | Xin Li <delphij@google.com> | 2021-03-03 21:41:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-03 21:41:40 +0000 |
| commit | c5b3df7061edb4eb68c0e27c32480bf1985dbc6f (patch) | |
| tree | 04c0c4755c52b849cb76d90e00947de40ab7b5a2 | |
| parent | 5b4662466b1a9a636e6cc81f14715720fe97a7f0 (diff) | |
| parent | 0bfcd5a5d65b93ce8b43b3a2113993c21a2df39e (diff) | |
| download | v8-c5b3df7061edb4eb68c0e27c32480bf1985dbc6f.tar.gz | |
Merge "Merge RQ2A.210305.007"android-s-beta-2android-s-beta-1
| -rw-r--r-- | src/messages.h | 2 | ||||
| -rw-r--r-- | src/parsing/parser-base.h | 3 | ||||
| -rw-r--r-- | src/parsing/scanner.cc | 9 | ||||
| -rw-r--r-- | src/parsing/scanner.h | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/messages.h b/src/messages.h index 030fc0b9..e94ce16e 100644 --- a/src/messages.h +++ b/src/messages.h @@ -695,7 +695,7 @@ class ErrorUtils : public AllStatic { T(TooManyArguments, \ "Too many arguments in function call (only 65535 allowed)") \ T(TooManyParameters, \ - "Too many parameters in function definition (only 65535 allowed)") \ + "Too many parameters in function definition (only 65534 allowed)") \ T(TooManySpreads, \ "Literal containing too many nested spreads (up to 65534 allowed)") \ T(TooManyVariables, "Too many variables declared (only 4194303 allowed)") \ diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h index 9d13724f..60d5e11f 100644 --- a/src/parsing/parser-base.h +++ b/src/parsing/parser-base.h @@ -3830,7 +3830,8 @@ void ParserBase<Impl>::ParseFormalParameterList(FormalParametersT* parameters, if (peek() != Token::RPAREN) { while (true) { - if (parameters->arity > Code::kMaxArguments) { + // Add one since we're going to be adding a parameter. + if (parameters->arity + 1 > Code::kMaxArguments) { ReportMessage(MessageTemplate::kTooManyParameters); *ok = false; return; diff --git a/src/parsing/scanner.cc b/src/parsing/scanner.cc index 781832c2..38d1936f 100644 --- a/src/parsing/scanner.cc +++ b/src/parsing/scanner.cc @@ -68,13 +68,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 e592debd..02cd247f 100644 --- a/src/parsing/scanner.h +++ b/src/parsing/scanner.h @@ -482,8 +482,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) { |