diff options
Diffstat (limited to 'chromium/v8')
| -rw-r--r-- | chromium/v8/src/deoptimizer/translated-state.cc | 8 | ||||
| -rw-r--r-- | chromium/v8/src/heap/cppgc/marker.cc | 6 | ||||
| -rw-r--r-- | chromium/v8/src/regexp/experimental/experimental-compiler.cc | 4 | ||||
| -rw-r--r-- | chromium/v8/src/torque/csa-generator.cc | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/chromium/v8/src/deoptimizer/translated-state.cc b/chromium/v8/src/deoptimizer/translated-state.cc index abbc0104a8f..7f511ca58ad 100644 --- a/chromium/v8/src/deoptimizer/translated-state.cc +++ b/chromium/v8/src/deoptimizer/translated-state.cc @@ -681,7 +681,7 @@ TranslatedFrame TranslatedFrame::JavaScriptBuiltinContinuationWithCatchFrame( namespace { -uint16_t InternalFormalParameterCountWithReceiver(SharedFunctionInfo sfi) { +uint16_t InternalFormalParameterCountWithReceiver2(SharedFunctionInfo sfi) { static constexpr int kTheReceiver = 1; return sfi.internal_formal_parameter_count() + kTheReceiver; } @@ -696,7 +696,7 @@ int TranslatedFrame::GetValueCount() { switch (kind()) { case kUnoptimizedFunction: { int parameter_count = - InternalFormalParameterCountWithReceiver(raw_shared_info_); + InternalFormalParameterCountWithReceiver2(raw_shared_info_); static constexpr int kTheContext = 1; static constexpr int kTheAccumulator = 1; return height() + parameter_count + kTheContext + kTheFunction + @@ -749,7 +749,7 @@ TranslatedFrame TranslatedState::CreateNextTranslatedFrame( if (trace_file != nullptr) { std::unique_ptr<char[]> name = shared_info.DebugNameCStr(); PrintF(trace_file, " reading input frame %s", name.get()); - int arg_count = InternalFormalParameterCountWithReceiver(shared_info); + int arg_count = InternalFormalParameterCountWithReceiver2(shared_info); PrintF(trace_file, " => bytecode_offset=%d, args=%d, height=%d, retval=%i(#%i); " "inputs:\n", @@ -1991,7 +1991,7 @@ TranslatedFrame* TranslatedState::GetArgumentsInfoFromJSFrameIndex( *args_count = frames_[i].ValueAt(height - 1)->GetSmiValue(); DCHECK_EQ(*args_count, 1); } else { - *args_count = InternalFormalParameterCountWithReceiver( + *args_count = InternalFormalParameterCountWithReceiver2( *frames_[i].shared_info()); } return &(frames_[i]); diff --git a/chromium/v8/src/heap/cppgc/marker.cc b/chromium/v8/src/heap/cppgc/marker.cc index d26fd580df9..eab10f4fd3c 100644 --- a/chromium/v8/src/heap/cppgc/marker.cc +++ b/chromium/v8/src/heap/cppgc/marker.cc @@ -89,9 +89,9 @@ void ResetRememberedSet(HeapBase& heap) { #endif } -static constexpr size_t kDefaultDeadlineCheckInterval = 150u; +static constexpr size_t kDefaultMarkerDeadlineCheckInterval = 150u; -template <size_t kDeadlineCheckInterval = kDefaultDeadlineCheckInterval, +template <size_t kDeadlineCheckInterval = kDefaultMarkerDeadlineCheckInterval, typename WorklistLocal, typename Callback> bool DrainWorklistWithBytesAndTimeDeadline(MarkingStateBase& marking_state, size_t marked_bytes_deadline, @@ -433,7 +433,7 @@ bool MarkerBase::ProcessWorklistsWithDeadline( { StatsCollector::EnabledScope inner_scope( heap().stats_collector(), StatsCollector::kMarkProcessBailOutObjects); - if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultDeadlineCheckInterval / + if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultMarkerDeadlineCheckInterval / 5>( mutator_marking_state_, marked_bytes_deadline, time_deadline, mutator_marking_state_.concurrent_marking_bailout_worklist(), diff --git a/chromium/v8/src/regexp/experimental/experimental-compiler.cc b/chromium/v8/src/regexp/experimental/experimental-compiler.cc index 4d53c2c0c55..69390c4b61d 100644 --- a/chromium/v8/src/regexp/experimental/experimental-compiler.cc +++ b/chromium/v8/src/regexp/experimental/experimental-compiler.cc @@ -180,7 +180,7 @@ bool ExperimentalRegExpCompiler::CanBeHandled(RegExpTree* tree, return CanBeHandledVisitor::Check(tree, flags, capture_count); } -namespace { +namespace experimental { // A label in bytecode which starts with no known address. The address *must* // be bound with `Bind` before the label goes out of scope. @@ -628,7 +628,7 @@ class CompileVisitor : private RegExpVisitor { ZoneList<RegExpInstruction> ExperimentalRegExpCompiler::Compile( RegExpTree* tree, JSRegExp::Flags flags, Zone* zone) { - return CompileVisitor::Compile(tree, flags, zone); + return experimental::CompileVisitor::Compile(tree, flags, zone); } } // namespace internal diff --git a/chromium/v8/src/torque/csa-generator.cc b/chromium/v8/src/torque/csa-generator.cc index 2f840c1918b..812385d1432 100644 --- a/chromium/v8/src/torque/csa-generator.cc +++ b/chromium/v8/src/torque/csa-generator.cc @@ -921,8 +921,8 @@ void CSAGenerator::EmitInstruction(const StoreReferenceInstruction& instruction, } namespace { -std::string GetBitFieldSpecialization(const Type* container, - const BitField& field) { +std::string GetBitFieldSpecialization2(const Type* container, + const BitField& field) { auto smi_tagged_type = Type::MatchUnaryGeneric(container, TypeOracle::GetSmiTaggedGeneric()); std::string container_type = smi_tagged_type @@ -975,7 +975,7 @@ void CSAGenerator::EmitInstruction(const LoadBitFieldInstruction& instruction, out() << " " << result_name << " = ca_.UncheckedCast<" << field_type->GetGeneratedTNodeTypeName() << ">(CodeStubAssembler(state_)." << decoder << "<" - << GetBitFieldSpecialization(struct_type, instruction.bit_field) + << GetBitFieldSpecialization2(struct_type, instruction.bit_field) << ">(ca_.UncheckedCast<" << struct_word_type << ">(" << bit_field_struct << ")));\n"; } @@ -1017,7 +1017,7 @@ void CSAGenerator::EmitInstruction(const StoreBitFieldInstruction& instruction, std::string result_expression = "CodeStubAssembler(state_)." + encoder + "<" + - GetBitFieldSpecialization(struct_type, instruction.bit_field) + + GetBitFieldSpecialization2(struct_type, instruction.bit_field) + ">(ca_.UncheckedCast<" + struct_word_type + ">(" + bit_field_struct + "), ca_.UncheckedCast<" + field_word_type + ">(" + value + ")" + (instruction.starts_as_zero ? ", true" : "") + ")"; |