Skip to content

Commit a2b5e64

Browse files
isheludkoCommit Bot
isheludko
authored and
Commit Bot
committed
[builtins] Remove BuiltinDescriptor.
Now TFJ builtins can use their own descriptors so there's no need to keep the hacky BuiltinDescriptor around. Bug: v8:7754 Change-Id: Ia7f23a21fb979370fd2149fef13186b83a3d5d30 Reviewed-on: https://chromium-review.googlesource.com/1104428 Commit-Queue: Igor Sheludko <ishell@chromium.org> Reviewed-by: Daniel Clifford <danno@chromium.org> Cr-Commit-Position: refs/heads/master@{#53806}
1 parent 733b7c8 commit a2b5e64

25 files changed

Lines changed: 449 additions & 532 deletions

‎src/builtins/builtins-array-gen.cc‎

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

‎src/builtins/builtins-async-generator-gen.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,12 @@ TF_BUILTIN(AsyncGeneratorPrototypeNext, AsyncGeneratorBuiltinsAssembler) {
329329
const int kValueArg = 0;
330330

331331
Node* argc =
332-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
332+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
333333
CodeStubArguments args(this, argc);
334334

335335
Node* generator = args.GetReceiver();
336336
Node* value = args.GetOptionalArgumentValue(kValueArg);
337-
Node* context = Parameter(BuiltinDescriptor::kContext);
337+
Node* context = Parameter(Descriptor::kContext);
338338

339339
AsyncGeneratorEnqueue(&args, context, generator, value,
340340
JSAsyncGeneratorObject::kNext,
@@ -347,12 +347,12 @@ TF_BUILTIN(AsyncGeneratorPrototypeReturn, AsyncGeneratorBuiltinsAssembler) {
347347
const int kValueArg = 0;
348348

349349
Node* argc =
350-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
350+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
351351
CodeStubArguments args(this, argc);
352352

353353
Node* generator = args.GetReceiver();
354354
Node* value = args.GetOptionalArgumentValue(kValueArg);
355-
Node* context = Parameter(BuiltinDescriptor::kContext);
355+
Node* context = Parameter(Descriptor::kContext);
356356

357357
AsyncGeneratorEnqueue(&args, context, generator, value,
358358
JSAsyncGeneratorObject::kReturn,
@@ -365,12 +365,12 @@ TF_BUILTIN(AsyncGeneratorPrototypeThrow, AsyncGeneratorBuiltinsAssembler) {
365365
const int kValueArg = 0;
366366

367367
Node* argc =
368-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
368+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
369369
CodeStubArguments args(this, argc);
370370

371371
Node* generator = args.GetReceiver();
372372
Node* value = args.GetOptionalArgumentValue(kValueArg);
373-
Node* context = Parameter(BuiltinDescriptor::kContext);
373+
Node* context = Parameter(Descriptor::kContext);
374374

375375
AsyncGeneratorEnqueue(&args, context, generator, value,
376376
JSAsyncGeneratorObject::kThrow,

‎src/builtins/builtins-collections-gen.cc‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -745,20 +745,20 @@ TNode<Object> CollectionsBuiltinsAssembler::AllocateTable(
745745
}
746746

747747
TF_BUILTIN(MapConstructor, CollectionsBuiltinsAssembler) {
748-
TNode<Object> new_target = CAST(Parameter(BuiltinDescriptor::kNewTarget));
748+
TNode<Object> new_target = CAST(Parameter(Descriptor::kJSNewTarget));
749749
TNode<IntPtrT> argc =
750-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
751-
TNode<Context> context = CAST(Parameter(BuiltinDescriptor::kContext));
750+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
751+
TNode<Context> context = CAST(Parameter(Descriptor::kContext));
752752

753753
GenerateConstructor(kMap, isolate()->factory()->Map_string(), new_target,
754754
argc, context);
755755
}
756756

757757
TF_BUILTIN(SetConstructor, CollectionsBuiltinsAssembler) {
758-
TNode<Object> new_target = CAST(Parameter(BuiltinDescriptor::kNewTarget));
758+
TNode<Object> new_target = CAST(Parameter(Descriptor::kJSNewTarget));
759759
TNode<IntPtrT> argc =
760-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
761-
TNode<Context> context = CAST(Parameter(BuiltinDescriptor::kContext));
760+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
761+
TNode<Context> context = CAST(Parameter(Descriptor::kContext));
762762

763763
GenerateConstructor(kSet, isolate()->factory()->Set_string(), new_target,
764764
argc, context);
@@ -1538,8 +1538,8 @@ TF_BUILTIN(MapPrototypeGetSize, CollectionsBuiltinsAssembler) {
15381538

15391539
TF_BUILTIN(MapPrototypeForEach, CollectionsBuiltinsAssembler) {
15401540
const char* const kMethodName = "Map.prototype.forEach";
1541-
Node* const argc = Parameter(BuiltinDescriptor::kArgumentsCount);
1542-
Node* const context = Parameter(BuiltinDescriptor::kContext);
1541+
Node* const argc = Parameter(Descriptor::kJSActualArgumentsCount);
1542+
Node* const context = Parameter(Descriptor::kContext);
15431543
CodeStubArguments args(this, ChangeInt32ToIntPtr(argc));
15441544
Node* const receiver = args.GetReceiver();
15451545
Node* const callback = args.GetOptionalArgumentValue(0);
@@ -1769,8 +1769,8 @@ TF_BUILTIN(SetPrototypeGetSize, CollectionsBuiltinsAssembler) {
17691769

17701770
TF_BUILTIN(SetPrototypeForEach, CollectionsBuiltinsAssembler) {
17711771
const char* const kMethodName = "Set.prototype.forEach";
1772-
Node* const argc = Parameter(BuiltinDescriptor::kArgumentsCount);
1773-
Node* const context = Parameter(BuiltinDescriptor::kContext);
1772+
Node* const argc = Parameter(Descriptor::kJSActualArgumentsCount);
1773+
Node* const context = Parameter(Descriptor::kContext);
17741774
CodeStubArguments args(this, ChangeInt32ToIntPtr(argc));
17751775
Node* const receiver = args.GetReceiver();
17761776
Node* const callback = args.GetOptionalArgumentValue(0);
@@ -2236,20 +2236,20 @@ TNode<IntPtrT> WeakCollectionsBuiltinsAssembler::ValueIndexFromKeyIndex(
22362236
}
22372237

22382238
TF_BUILTIN(WeakMapConstructor, WeakCollectionsBuiltinsAssembler) {
2239-
TNode<Object> new_target = CAST(Parameter(BuiltinDescriptor::kNewTarget));
2239+
TNode<Object> new_target = CAST(Parameter(Descriptor::kJSNewTarget));
22402240
TNode<IntPtrT> argc =
2241-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
2242-
TNode<Context> context = CAST(Parameter(BuiltinDescriptor::kContext));
2241+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
2242+
TNode<Context> context = CAST(Parameter(Descriptor::kContext));
22432243

22442244
GenerateConstructor(kWeakMap, isolate()->factory()->WeakMap_string(),
22452245
new_target, argc, context);
22462246
}
22472247

22482248
TF_BUILTIN(WeakSetConstructor, WeakCollectionsBuiltinsAssembler) {
2249-
TNode<Object> new_target = CAST(Parameter(BuiltinDescriptor::kNewTarget));
2249+
TNode<Object> new_target = CAST(Parameter(Descriptor::kJSNewTarget));
22502250
TNode<IntPtrT> argc =
2251-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
2252-
TNode<Context> context = CAST(Parameter(BuiltinDescriptor::kContext));
2251+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
2252+
TNode<Context> context = CAST(Parameter(Descriptor::kContext));
22532253

22542254
GenerateConstructor(kWeakSet, isolate()->factory()->WeakSet_string(),
22552255
new_target, argc, context);

‎src/builtins/builtins-console-gen.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ TF_BUILTIN(FastConsoleAssert, CodeStubAssembler) {
1616

1717
// TODO(ishell): use constants from Descriptor once the JSFunction linkage
1818
// arguments are reordered.
19-
Node* argc = Parameter(BuiltinDescriptor::kArgumentsCount);
20-
Node* context = Parameter(BuiltinDescriptor::kContext);
21-
Node* new_target = Parameter(BuiltinDescriptor::kNewTarget);
19+
Node* argc = Parameter(Descriptor::kJSActualArgumentsCount);
20+
Node* context = Parameter(Descriptor::kContext);
21+
Node* new_target = Parameter(Descriptor::kJSNewTarget);
2222
GotoIf(Word32Equal(argc, Int32Constant(0)), &runtime);
2323

2424
CodeStubArguments args(this, ChangeInt32ToIntPtr(argc));

‎src/builtins/builtins-constructor-gen.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -631,10 +631,10 @@ Node* ConstructorBuiltinsAssembler::EmitCreateEmptyObjectLiteral(
631631
TF_BUILTIN(ObjectConstructor, ConstructorBuiltinsAssembler) {
632632
int const kValueArg = 0;
633633
Node* argc =
634-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
634+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
635635
CodeStubArguments args(this, argc);
636-
Node* context = Parameter(BuiltinDescriptor::kContext);
637-
Node* new_target = Parameter(BuiltinDescriptor::kNewTarget);
636+
Node* context = Parameter(Descriptor::kContext);
637+
Node* new_target = Parameter(Descriptor::kJSNewTarget);
638638

639639
VARIABLE(var_result, MachineRepresentation::kTagged);
640640
Label if_subclass(this, Label::kDeferred), if_notsubclass(this),
@@ -683,9 +683,9 @@ TF_BUILTIN(ObjectConstructor, ConstructorBuiltinsAssembler) {
683683

684684
// ES #sec-number-constructor
685685
TF_BUILTIN(NumberConstructor, ConstructorBuiltinsAssembler) {
686-
Node* context = Parameter(BuiltinDescriptor::kContext);
686+
Node* context = Parameter(Descriptor::kContext);
687687
Node* argc =
688-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
688+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
689689
CodeStubArguments args(this, argc);
690690

691691
// 1. If no arguments were passed to this function invocation, let n be +0.
@@ -705,7 +705,7 @@ TF_BUILTIN(NumberConstructor, ConstructorBuiltinsAssembler) {
705705
{
706706
// 3. If NewTarget is undefined, return n.
707707
Node* n_value = var_n.value();
708-
Node* new_target = Parameter(BuiltinDescriptor::kNewTarget);
708+
Node* new_target = Parameter(Descriptor::kJSNewTarget);
709709
Label return_n(this), constructnumber(this, Label::kDeferred);
710710
Branch(IsUndefined(new_target), &return_n, &constructnumber);
711711

@@ -730,12 +730,12 @@ TF_BUILTIN(NumberConstructor, ConstructorBuiltinsAssembler) {
730730

731731
// https://tc39.github.io/ecma262/#sec-string-constructor
732732
TF_BUILTIN(StringConstructor, ConstructorBuiltinsAssembler) {
733-
Node* context = Parameter(BuiltinDescriptor::kContext);
733+
Node* context = Parameter(Descriptor::kContext);
734734
Node* argc =
735-
ChangeInt32ToIntPtr(Parameter(BuiltinDescriptor::kArgumentsCount));
735+
ChangeInt32ToIntPtr(Parameter(Descriptor::kJSActualArgumentsCount));
736736
CodeStubArguments args(this, argc);
737737

738-
Node* new_target = Parameter(BuiltinDescriptor::kNewTarget);
738+
Node* new_target = Parameter(Descriptor::kJSNewTarget);
739739
Node* target = LoadFromFrame(StandardFrameConstants::kFunctionOffset,
740740
MachineType::TaggedPointer());
741741

0 commit comments

Comments
 (0)