Skip to content

Commit 9c9e2d7

Browse files
targostargos
committed
deps: backport 3297130 from upstream V8
This fixes a build failure on Windows. Original commit message: Rename TypeFeedbackVector to FeedbackVector. ... and TypeFeedbackMetadata to FeedbackMetadata. BUG= Change-Id: I2556d1c2a8f37b8cf3d532cc98d973b6dc7e9e6c Reviewed-on: https://chromium-review.googlesource.com/439244 Commit-Queue: Igor Sheludko <[email protected]> Reviewed-by: Michael Starzinger <[email protected]> Reviewed-by: Michael Stanton <[email protected]> Reviewed-by: Jaroslav Sevcik <[email protected]> Reviewed-by: Yang Guo <[email protected]> Reviewed-by: Hannes Payer <[email protected]> Cr-Commit-Position: refs/heads/master@{#42999} Refs: nodejs/v8#4 PR-URL: #11752 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Franziska Hinkelmann <[email protected]>
1 parent 07088e6 commit 9c9e2d7

File tree

123 files changed

+846
-928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+846
-928
lines changed

‎deps/v8/BUILD.gn

+3-3
Original file line numberDiff line numberDiff line change
@@ -1377,6 +1377,9 @@ v8_source_set("v8_base") {
13771377
"src/fast-accessor-assembler.h",
13781378
"src/fast-dtoa.cc",
13791379
"src/fast-dtoa.h",
1380+
"src/feedback-vector-inl.h",
1381+
"src/feedback-vector.cc",
1382+
"src/feedback-vector.h",
13801383
"src/field-index-inl.h",
13811384
"src/field-index.h",
13821385
"src/field-type.cc",
@@ -1748,9 +1751,6 @@ v8_source_set("v8_base") {
17481751
"src/transitions.cc",
17491752
"src/transitions.h",
17501753
"src/trap-handler/trap-handler.h",
1751-
"src/type-feedback-vector-inl.h",
1752-
"src/type-feedback-vector.cc",
1753-
"src/type-feedback-vector.h",
17541754
"src/type-hints.cc",
17551755
"src/type-hints.h",
17561756
"src/type-info.cc",

‎deps/v8/src/arm/code-stubs-arm.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1623,9 +1623,9 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
16231623
// r3 : slot in feedback vector (Smi)
16241624
Label initialize, done, miss, megamorphic, not_array_function;
16251625

1626-
DCHECK_EQ(*TypeFeedbackVector::MegamorphicSentinel(masm->isolate()),
1626+
DCHECK_EQ(*FeedbackVector::MegamorphicSentinel(masm->isolate()),
16271627
masm->isolate()->heap()->megamorphic_symbol());
1628-
DCHECK_EQ(*TypeFeedbackVector::UninitializedSentinel(masm->isolate()),
1628+
DCHECK_EQ(*FeedbackVector::UninitializedSentinel(masm->isolate()),
16291629
masm->isolate()->heap()->uninitialized_symbol());
16301630

16311631
// Load the cache state into r5.
@@ -1635,7 +1635,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
16351635
// A monomorphic cache hit or an already megamorphic state: invoke the
16361636
// function without changing the state.
16371637
// We don't know if r5 is a WeakCell or a Symbol, but it's harmless to read at
1638-
// this position in a symbol (see static asserts in type-feedback-vector.h).
1638+
// this position in a symbol (see static asserts in feedback-vector.h).
16391639
Label check_allocation_site;
16401640
Register feedback_map = r6;
16411641
Register weak_value = r9;
@@ -2925,7 +2925,7 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
29252925
}
29262926

29272927
void CallICTrampolineStub::Generate(MacroAssembler* masm) {
2928-
__ EmitLoadTypeFeedbackVector(r2);
2928+
__ EmitLoadFeedbackVector(r2);
29292929
CallICStub stub(isolate(), state());
29302930
__ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
29312931
}

‎deps/v8/src/arm/macro-assembler-arm.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1429,8 +1429,7 @@ void MacroAssembler::Prologue(bool code_pre_aging) {
14291429
}
14301430
}
14311431

1432-
1433-
void MacroAssembler::EmitLoadTypeFeedbackVector(Register vector) {
1432+
void MacroAssembler::EmitLoadFeedbackVector(Register vector) {
14341433
ldr(vector, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
14351434
ldr(vector, FieldMemOperand(vector, JSFunction::kLiteralsOffset));
14361435
ldr(vector, FieldMemOperand(vector, LiteralsArray::kFeedbackVectorOffset));

‎deps/v8/src/arm/macro-assembler-arm.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ class MacroAssembler: public Assembler {
13851385
}
13861386

13871387
// Load the type feedback vector from a JavaScript frame.
1388-
void EmitLoadTypeFeedbackVector(Register vector);
1388+
void EmitLoadFeedbackVector(Register vector);
13891389

13901390
// Activation support.
13911391
void EnterFrame(StackFrame::Type type,

‎deps/v8/src/arm64/code-stubs-arm64.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1826,9 +1826,9 @@ static void GenerateRecordCallTarget(MacroAssembler* masm, Register argc,
18261826
// index : slot in feedback vector (smi)
18271827
Label initialize, done, miss, megamorphic, not_array_function;
18281828

1829-
DCHECK_EQ(*TypeFeedbackVector::MegamorphicSentinel(masm->isolate()),
1829+
DCHECK_EQ(*FeedbackVector::MegamorphicSentinel(masm->isolate()),
18301830
masm->isolate()->heap()->megamorphic_symbol());
1831-
DCHECK_EQ(*TypeFeedbackVector::UninitializedSentinel(masm->isolate()),
1831+
DCHECK_EQ(*FeedbackVector::UninitializedSentinel(masm->isolate()),
18321832
masm->isolate()->heap()->uninitialized_symbol());
18331833

18341834
// Load the cache state.
@@ -1843,7 +1843,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm, Register argc,
18431843
// function without changing the state.
18441844
// We don't know if feedback value is a WeakCell or a Symbol, but it's
18451845
// harmless to read at this position in a symbol (see static asserts in
1846-
// type-feedback-vector.h).
1846+
// feedback-vector.h).
18471847
Label check_allocation_site;
18481848
__ Ldr(feedback_value, FieldMemOperand(feedback, WeakCell::kValueOffset));
18491849
__ Cmp(function, feedback_value);
@@ -2967,7 +2967,7 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
29672967
}
29682968

29692969
void CallICTrampolineStub::Generate(MacroAssembler* masm) {
2970-
__ EmitLoadTypeFeedbackVector(x2);
2970+
__ EmitLoadFeedbackVector(x2);
29712971
CallICStub stub(isolate(), state());
29722972
__ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
29732973
}

‎deps/v8/src/arm64/macro-assembler-arm64.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -2634,8 +2634,7 @@ void MacroAssembler::Prologue(bool code_pre_aging) {
26342634
}
26352635
}
26362636

2637-
2638-
void MacroAssembler::EmitLoadTypeFeedbackVector(Register vector) {
2637+
void MacroAssembler::EmitLoadFeedbackVector(Register vector) {
26392638
Ldr(vector, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
26402639
Ldr(vector, FieldMemOperand(vector, JSFunction::kLiteralsOffset));
26412640
Ldr(vector, FieldMemOperand(vector, LiteralsArray::kFeedbackVectorOffset));

‎deps/v8/src/arm64/macro-assembler-arm64.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ class MacroAssembler : public Assembler {
15411541
// Frames.
15421542

15431543
// Load the type feedback vector from a JavaScript frame.
1544-
void EmitLoadTypeFeedbackVector(Register vector);
1544+
void EmitLoadFeedbackVector(Register vector);
15451545

15461546
// Activation support.
15471547
void EnterFrame(StackFrame::Type type);

‎deps/v8/src/ast/context-slot-cache.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// (disallowed) include: src/factory.h -> src/objects-inl.h
1313
#include "src/objects-inl.h"
1414
// FIXME(mstarzinger, marja): This is weird, but required because of the missing
15-
// (disallowed) include: src/type-feedback-vector.h ->
16-
// src/type-feedback-vector-inl.h
17-
#include "src/type-feedback-vector-inl.h"
15+
// (disallowed) include: src/feedback-vector.h ->
16+
// src/feedback-vector-inl.h
17+
#include "src/feedback-vector-inl.h"
1818

1919
namespace v8 {
2020
namespace internal {

‎deps/v8/src/builtins/arm/builtins-arm.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1019,12 +1019,12 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
10191019
__ ldr(r2, FieldMemOperand(r1, JSFunction::kLiteralsOffset));
10201020
__ ldr(r2, FieldMemOperand(r2, LiteralsArray::kFeedbackVectorOffset));
10211021
__ ldr(r9, FieldMemOperand(
1022-
r2, TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
1023-
TypeFeedbackVector::kHeaderSize));
1022+
r2, FeedbackVector::kInvocationCountIndex * kPointerSize +
1023+
FeedbackVector::kHeaderSize));
10241024
__ add(r9, r9, Operand(Smi::FromInt(1)));
10251025
__ str(r9, FieldMemOperand(
1026-
r2, TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
1027-
TypeFeedbackVector::kHeaderSize));
1026+
r2, FeedbackVector::kInvocationCountIndex * kPointerSize +
1027+
FeedbackVector::kHeaderSize));
10281028

10291029
// Check function data field is actually a BytecodeArray object.
10301030
if (FLAG_debug_code) {

‎deps/v8/src/builtins/arm64/builtins-arm64.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1022,13 +1022,13 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
10221022
// Increment invocation count for the function.
10231023
__ Ldr(x11, FieldMemOperand(x1, JSFunction::kLiteralsOffset));
10241024
__ Ldr(x11, FieldMemOperand(x11, LiteralsArray::kFeedbackVectorOffset));
1025-
__ Ldr(x10, FieldMemOperand(x11, TypeFeedbackVector::kInvocationCountIndex *
1025+
__ Ldr(x10, FieldMemOperand(x11, FeedbackVector::kInvocationCountIndex *
10261026
kPointerSize +
1027-
TypeFeedbackVector::kHeaderSize));
1027+
FeedbackVector::kHeaderSize));
10281028
__ Add(x10, x10, Operand(Smi::FromInt(1)));
1029-
__ Str(x10, FieldMemOperand(x11, TypeFeedbackVector::kInvocationCountIndex *
1030-
kPointerSize +
1031-
TypeFeedbackVector::kHeaderSize));
1029+
__ Str(x10, FieldMemOperand(
1030+
x11, FeedbackVector::kInvocationCountIndex * kPointerSize +
1031+
FeedbackVector::kHeaderSize));
10321032

10331033
// Check function data field is actually a BytecodeArray object.
10341034
if (FLAG_debug_code) {

‎deps/v8/src/builtins/ia32/builtins-ia32.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -548,11 +548,11 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
548548
__ j(not_equal, &switch_to_different_code_kind);
549549

550550
// Increment invocation count for the function.
551-
__ EmitLoadTypeFeedbackVector(ecx);
552-
__ add(FieldOperand(ecx,
553-
TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
554-
TypeFeedbackVector::kHeaderSize),
555-
Immediate(Smi::FromInt(1)));
551+
__ EmitLoadFeedbackVector(ecx);
552+
__ add(
553+
FieldOperand(ecx, FeedbackVector::kInvocationCountIndex * kPointerSize +
554+
FeedbackVector::kHeaderSize),
555+
Immediate(Smi::FromInt(1)));
556556

557557
// Check function data field is actually a BytecodeArray object.
558558
if (FLAG_debug_code) {

‎deps/v8/src/builtins/mips/builtins-mips.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1021,12 +1021,12 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
10211021
__ lw(a0, FieldMemOperand(a1, JSFunction::kLiteralsOffset));
10221022
__ lw(a0, FieldMemOperand(a0, LiteralsArray::kFeedbackVectorOffset));
10231023
__ lw(t0, FieldMemOperand(
1024-
a0, TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
1025-
TypeFeedbackVector::kHeaderSize));
1024+
a0, FeedbackVector::kInvocationCountIndex * kPointerSize +
1025+
FeedbackVector::kHeaderSize));
10261026
__ Addu(t0, t0, Operand(Smi::FromInt(1)));
10271027
__ sw(t0, FieldMemOperand(
1028-
a0, TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
1029-
TypeFeedbackVector::kHeaderSize));
1028+
a0, FeedbackVector::kInvocationCountIndex * kPointerSize +
1029+
FeedbackVector::kHeaderSize));
10301030

10311031
// Check function data field is actually a BytecodeArray object.
10321032
if (FLAG_debug_code) {

‎deps/v8/src/builtins/mips64/builtins-mips64.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1012,12 +1012,12 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
10121012
__ ld(a0, FieldMemOperand(a1, JSFunction::kLiteralsOffset));
10131013
__ ld(a0, FieldMemOperand(a0, LiteralsArray::kFeedbackVectorOffset));
10141014
__ ld(a4, FieldMemOperand(
1015-
a0, TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
1016-
TypeFeedbackVector::kHeaderSize));
1015+
a0, FeedbackVector::kInvocationCountIndex * kPointerSize +
1016+
FeedbackVector::kHeaderSize));
10171017
__ Daddu(a4, a4, Operand(Smi::FromInt(1)));
10181018
__ sd(a4, FieldMemOperand(
1019-
a0, TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
1020-
TypeFeedbackVector::kHeaderSize));
1019+
a0, FeedbackVector::kInvocationCountIndex * kPointerSize +
1020+
FeedbackVector::kHeaderSize));
10211021

10221022
// Check function data field is actually a BytecodeArray object.
10231023
if (FLAG_debug_code) {

‎deps/v8/src/builtins/ppc/builtins-ppc.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1035,13 +1035,13 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
10351035
// Increment invocation count for the function.
10361036
__ LoadP(r7, FieldMemOperand(r4, JSFunction::kLiteralsOffset));
10371037
__ LoadP(r7, FieldMemOperand(r7, LiteralsArray::kFeedbackVectorOffset));
1038-
__ LoadP(r8, FieldMemOperand(r7, TypeFeedbackVector::kInvocationCountIndex *
1038+
__ LoadP(r8, FieldMemOperand(r7, FeedbackVector::kInvocationCountIndex *
10391039
kPointerSize +
1040-
TypeFeedbackVector::kHeaderSize));
1040+
FeedbackVector::kHeaderSize));
10411041
__ AddSmiLiteral(r8, r8, Smi::FromInt(1), r0);
1042-
__ StoreP(r8, FieldMemOperand(r7, TypeFeedbackVector::kInvocationCountIndex *
1043-
kPointerSize +
1044-
TypeFeedbackVector::kHeaderSize),
1042+
__ StoreP(r8, FieldMemOperand(
1043+
r7, FeedbackVector::kInvocationCountIndex * kPointerSize +
1044+
FeedbackVector::kHeaderSize),
10451045
r0);
10461046

10471047
// Check function data field is actually a BytecodeArray object.

‎deps/v8/src/builtins/s390/builtins-s390.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -1040,13 +1040,13 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
10401040
// Increment invocation count for the function.
10411041
__ LoadP(r6, FieldMemOperand(r3, JSFunction::kLiteralsOffset));
10421042
__ LoadP(r6, FieldMemOperand(r6, LiteralsArray::kFeedbackVectorOffset));
1043-
__ LoadP(r1, FieldMemOperand(r6, TypeFeedbackVector::kInvocationCountIndex *
1043+
__ LoadP(r1, FieldMemOperand(r6, FeedbackVector::kInvocationCountIndex *
10441044
kPointerSize +
1045-
TypeFeedbackVector::kHeaderSize));
1045+
FeedbackVector::kHeaderSize));
10461046
__ AddSmiLiteral(r1, r1, Smi::FromInt(1), r0);
1047-
__ StoreP(r1, FieldMemOperand(r6, TypeFeedbackVector::kInvocationCountIndex *
1048-
kPointerSize +
1049-
TypeFeedbackVector::kHeaderSize));
1047+
__ StoreP(r1, FieldMemOperand(
1048+
r6, FeedbackVector::kInvocationCountIndex * kPointerSize +
1049+
FeedbackVector::kHeaderSize));
10501050

10511051
// Check function data field is actually a BytecodeArray object.
10521052
if (FLAG_debug_code) {

‎deps/v8/src/builtins/x64/builtins-x64.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -628,9 +628,8 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
628628
__ movp(rcx, FieldOperand(rdi, JSFunction::kLiteralsOffset));
629629
__ movp(rcx, FieldOperand(rcx, LiteralsArray::kFeedbackVectorOffset));
630630
__ SmiAddConstant(
631-
FieldOperand(rcx,
632-
TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
633-
TypeFeedbackVector::kHeaderSize),
631+
FieldOperand(rcx, FeedbackVector::kInvocationCountIndex * kPointerSize +
632+
FeedbackVector::kHeaderSize),
634633
Smi::FromInt(1));
635634

636635
// Check function data field is actually a BytecodeArray object.

‎deps/v8/src/builtins/x87/builtins-x87.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,11 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
549549
__ j(not_equal, &switch_to_different_code_kind);
550550

551551
// Increment invocation count for the function.
552-
__ EmitLoadTypeFeedbackVector(ecx);
553-
__ add(FieldOperand(ecx,
554-
TypeFeedbackVector::kInvocationCountIndex * kPointerSize +
555-
TypeFeedbackVector::kHeaderSize),
556-
Immediate(Smi::FromInt(1)));
552+
__ EmitLoadFeedbackVector(ecx);
553+
__ add(
554+
FieldOperand(ecx, FeedbackVector::kInvocationCountIndex * kPointerSize +
555+
FeedbackVector::kHeaderSize),
556+
Immediate(Smi::FromInt(1)));
557557

558558
// Check function data field is actually a BytecodeArray object.
559559
if (FLAG_debug_code) {

‎deps/v8/src/code-stub-assembler.cc

+4-6
Original file line numberDiff line numberDiff line change
@@ -5461,23 +5461,21 @@ Node* CodeStubAssembler::ElementOffsetFromIndex(Node* index_node,
54615461
return IntPtrAdd(IntPtrConstant(base_size), shifted_index);
54625462
}
54635463

5464-
Node* CodeStubAssembler::LoadTypeFeedbackVectorForStub() {
5464+
Node* CodeStubAssembler::LoadFeedbackVectorForStub() {
54655465
Node* function =
54665466
LoadFromParentFrame(JavaScriptFrameConstants::kFunctionOffset);
54675467
Node* literals = LoadObjectField(function, JSFunction::kLiteralsOffset);
54685468
return LoadObjectField(literals, LiteralsArray::kFeedbackVectorOffset);
54695469
}
54705470

5471-
void CodeStubAssembler::UpdateFeedback(Node* feedback,
5472-
Node* type_feedback_vector,
5471+
void CodeStubAssembler::UpdateFeedback(Node* feedback, Node* feedback_vector,
54735472
Node* slot_id) {
54745473
// This method is used for binary op and compare feedback. These
54755474
// vector nodes are initialized with a smi 0, so we can simply OR
54765475
// our new feedback in place.
5477-
Node* previous_feedback =
5478-
LoadFixedArrayElement(type_feedback_vector, slot_id);
5476+
Node* previous_feedback = LoadFixedArrayElement(feedback_vector, slot_id);
54795477
Node* combined_feedback = SmiOr(previous_feedback, feedback);
5480-
StoreFixedArrayElement(type_feedback_vector, slot_id, combined_feedback,
5478+
StoreFixedArrayElement(feedback_vector, slot_id, combined_feedback,
54815479
SKIP_WRITE_BARRIER);
54825480
}
54835481

‎deps/v8/src/code-stub-assembler.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -988,11 +988,10 @@ class V8_EXPORT_PRIVATE CodeStubAssembler : public compiler::CodeAssembler {
988988
Node* OrdinaryHasInstance(Node* context, Node* callable, Node* object);
989989

990990
// Load type feedback vector from the stub caller's frame.
991-
Node* LoadTypeFeedbackVectorForStub();
991+
Node* LoadFeedbackVectorForStub();
992992

993993
// Update the type feedback vector.
994-
void UpdateFeedback(Node* feedback, Node* type_feedback_vector,
995-
Node* slot_id);
994+
void UpdateFeedback(Node* feedback, Node* feedback_vector, Node* slot_id);
996995

997996
Node* LoadReceiverMap(Node* receiver);
998997

0 commit comments

Comments
 (0)