Skip to content

Commit 071b01b

Browse files
LeszekSwirskiCommit Bot
LeszekSwirski
authored and
Commit Bot
committed
[objects] Rename SFI compiler_hints to flags
Since the flags are used for more than just giving hints to the compiler, the name isn't appropriate anymore. Change-Id: I4b2f87a117490e7f1e1a693394e46633e751b444 Reviewed-on: https://chromium-review.googlesource.com/982012 Reviewed-by: Camillo Bruni <cbruni@chromium.org> Reviewed-by: Marja Hölttä <marja@chromium.org> Commit-Queue: Leszek Swirski <leszeks@chromium.org> Cr-Commit-Position: refs/heads/master@{#52245}
1 parent 496d059 commit 071b01b

19 files changed

Lines changed: 85 additions & 91 deletions

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
278278
// -----------------------------------
279279

280280
__ ldr(r4, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset));
281-
__ ldr(r4, FieldMemOperand(r4, SharedFunctionInfo::kCompilerHintsOffset));
281+
__ ldr(r4, FieldMemOperand(r4, SharedFunctionInfo::kFlagsOffset));
282282
__ tst(r4, Operand(SharedFunctionInfo::IsDerivedConstructorBit::kMask));
283283
__ b(ne, &not_create_implicit_receiver);
284284

@@ -398,7 +398,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
398398
__ bind(&other_result);
399399
__ ldr(r4, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
400400
__ ldr(r4, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
401-
__ ldr(r4, FieldMemOperand(r4, SharedFunctionInfo::kCompilerHintsOffset));
401+
__ ldr(r4, FieldMemOperand(r4, SharedFunctionInfo::kFlagsOffset));
402402
__ tst(r4, Operand(SharedFunctionInfo::IsClassConstructorBit::kMask));
403403

404404
if (restrict_constructor_return) {
@@ -1988,7 +1988,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
19881988
// Check that the function is not a "classConstructor".
19891989
Label class_constructor;
19901990
__ ldr(r2, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset));
1991-
__ ldr(r3, FieldMemOperand(r2, SharedFunctionInfo::kCompilerHintsOffset));
1991+
__ ldr(r3, FieldMemOperand(r2, SharedFunctionInfo::kFlagsOffset));
19921992
__ tst(r3, Operand(SharedFunctionInfo::IsClassConstructorBit::kMask));
19931993
__ b(ne, &class_constructor);
19941994

@@ -1998,7 +1998,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
19981998
__ ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset));
19991999
// We need to convert the receiver for non-native sloppy mode functions.
20002000
Label done_convert;
2001-
__ ldr(r3, FieldMemOperand(r2, SharedFunctionInfo::kCompilerHintsOffset));
2001+
__ ldr(r3, FieldMemOperand(r2, SharedFunctionInfo::kFlagsOffset));
20022002
__ tst(r3, Operand(SharedFunctionInfo::IsNativeBit::kMask |
20032003
SharedFunctionInfo::IsStrictBit::kMask));
20042004
__ b(ne, &done_convert);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
313313
// -----------------------------------
314314

315315
__ Ldr(x4, FieldMemOperand(x1, JSFunction::kSharedFunctionInfoOffset));
316-
__ Ldr(w4, FieldMemOperand(x4, SharedFunctionInfo::kCompilerHintsOffset));
316+
__ Ldr(w4, FieldMemOperand(x4, SharedFunctionInfo::kFlagsOffset));
317317
__ TestAndBranchIfAnySet(w4,
318318
SharedFunctionInfo::IsDerivedConstructorBit::kMask,
319319
&not_create_implicit_receiver);
@@ -439,7 +439,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
439439
__ Bind(&other_result);
440440
__ Ldr(x4, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
441441
__ Ldr(x4, FieldMemOperand(x4, JSFunction::kSharedFunctionInfoOffset));
442-
__ Ldr(w4, FieldMemOperand(x4, SharedFunctionInfo::kCompilerHintsOffset));
442+
__ Ldr(w4, FieldMemOperand(x4, SharedFunctionInfo::kFlagsOffset));
443443

444444
if (restrict_constructor_return) {
445445
// Throw if constructor function is a class constructor
@@ -2350,7 +2350,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
23502350
// Check that function is not a "classConstructor".
23512351
Label class_constructor;
23522352
__ Ldr(x2, FieldMemOperand(x1, JSFunction::kSharedFunctionInfoOffset));
2353-
__ Ldr(w3, FieldMemOperand(x2, SharedFunctionInfo::kCompilerHintsOffset));
2353+
__ Ldr(w3, FieldMemOperand(x2, SharedFunctionInfo::kFlagsOffset));
23542354
__ TestAndBranchIfAnySet(w3, SharedFunctionInfo::IsClassConstructorBit::kMask,
23552355
&class_constructor);
23562356

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,12 @@ TF_BUILTIN(FastNewClosure, ConstructorBuiltinsAssembler) {
9999

100100
// The calculation of |function_map_index| must be in sync with
101101
// SharedFunctionInfo::function_map_index().
102-
Node* const compiler_hints = LoadObjectField(
103-
shared_function_info, SharedFunctionInfo::kCompilerHintsOffset,
104-
MachineType::Uint32());
105-
Node* const function_map_index =
106-
IntPtrAdd(DecodeWordFromWord32<SharedFunctionInfo::FunctionMapIndexBits>(
107-
compiler_hints),
108-
IntPtrConstant(Context::FIRST_FUNCTION_MAP_INDEX));
102+
Node* const flags =
103+
LoadObjectField(shared_function_info, SharedFunctionInfo::kFlagsOffset,
104+
MachineType::Uint32());
105+
Node* const function_map_index = IntPtrAdd(
106+
DecodeWordFromWord32<SharedFunctionInfo::FunctionMapIndexBits>(flags),
107+
IntPtrConstant(Context::FIRST_FUNCTION_MAP_INDEX));
109108
CSA_ASSERT(this, UintPtrLessThanOrEqual(
110109
function_map_index,
111110
IntPtrConstant(Context::LAST_FUNCTION_MAP_INDEX)));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
217217
// -----------------------------------
218218

219219
__ mov(ebx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset));
220-
__ test(FieldOperand(ebx, SharedFunctionInfo::kCompilerHintsOffset),
220+
__ test(FieldOperand(ebx, SharedFunctionInfo::kFlagsOffset),
221221
Immediate(SharedFunctionInfo::IsDerivedConstructorBit::kMask));
222222
__ j(not_zero, &not_create_implicit_receiver);
223223

@@ -338,7 +338,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
338338
__ bind(&other_result);
339339
__ mov(ebx, Operand(ebp, ConstructFrameConstants::kConstructorOffset));
340340
__ mov(ebx, FieldOperand(ebx, JSFunction::kSharedFunctionInfoOffset));
341-
__ test(FieldOperand(ebx, SharedFunctionInfo::kCompilerHintsOffset),
341+
__ test(FieldOperand(ebx, SharedFunctionInfo::kFlagsOffset),
342342
Immediate(SharedFunctionInfo::IsClassConstructorBit::kMask));
343343

344344
if (restrict_constructor_return) {
@@ -2124,7 +2124,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
21242124
// Check that the function is not a "classConstructor".
21252125
Label class_constructor;
21262126
__ mov(edx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset));
2127-
__ test(FieldOperand(edx, SharedFunctionInfo::kCompilerHintsOffset),
2127+
__ test(FieldOperand(edx, SharedFunctionInfo::kFlagsOffset),
21282128
Immediate(SharedFunctionInfo::IsClassConstructorBit::kMask));
21292129
__ j(not_zero, &class_constructor);
21302130

@@ -2134,7 +2134,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
21342134
__ mov(esi, FieldOperand(edi, JSFunction::kContextOffset));
21352135
// We need to convert the receiver for non-native sloppy mode functions.
21362136
Label done_convert;
2137-
__ test(FieldOperand(edx, SharedFunctionInfo::kCompilerHintsOffset),
2137+
__ test(FieldOperand(edx, SharedFunctionInfo::kFlagsOffset),
21382138
Immediate(SharedFunctionInfo::IsNativeBit::kMask |
21392139
SharedFunctionInfo::IsStrictBit::kMask));
21402140
__ j(not_zero, &done_convert);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
269269
// -----------------------------------
270270

271271
__ lw(t2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
272-
__ lw(t2, FieldMemOperand(t2, SharedFunctionInfo::kCompilerHintsOffset));
272+
__ lw(t2, FieldMemOperand(t2, SharedFunctionInfo::kFlagsOffset));
273273
__ And(t2, t2, Operand(SharedFunctionInfo::IsDerivedConstructorBit::kMask));
274274
__ Branch(&not_create_implicit_receiver, ne, t2, Operand(zero_reg));
275275

@@ -390,7 +390,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
390390
__ bind(&other_result);
391391
__ lw(a1, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
392392
__ lw(t2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
393-
__ lw(t2, FieldMemOperand(t2, SharedFunctionInfo::kCompilerHintsOffset));
393+
__ lw(t2, FieldMemOperand(t2, SharedFunctionInfo::kFlagsOffset));
394394
__ And(t2, t2, Operand(SharedFunctionInfo::IsClassConstructorBit::kMask));
395395

396396
if (restrict_constructor_return) {
@@ -1998,7 +1998,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
19981998
// Check that the function is not a "classConstructor".
19991999
Label class_constructor;
20002000
__ lw(a2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
2001-
__ lw(a3, FieldMemOperand(a2, SharedFunctionInfo::kCompilerHintsOffset));
2001+
__ lw(a3, FieldMemOperand(a2, SharedFunctionInfo::kFlagsOffset));
20022002
__ And(at, a3, Operand(SharedFunctionInfo::IsClassConstructorBit::kMask));
20032003
__ Branch(&class_constructor, ne, at, Operand(zero_reg));
20042004

@@ -2008,7 +2008,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
20082008
__ lw(cp, FieldMemOperand(a1, JSFunction::kContextOffset));
20092009
// We need to convert the receiver for non-native sloppy mode functions.
20102010
Label done_convert;
2011-
__ lw(a3, FieldMemOperand(a2, SharedFunctionInfo::kCompilerHintsOffset));
2011+
__ lw(a3, FieldMemOperand(a2, SharedFunctionInfo::kFlagsOffset));
20122012
__ And(at, a3,
20132013
Operand(SharedFunctionInfo::IsNativeBit::kMask |
20142014
SharedFunctionInfo::IsStrictBit::kMask));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
269269
// -----------------------------------
270270

271271
__ Ld(t2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
272-
__ lwu(t2, FieldMemOperand(t2, SharedFunctionInfo::kCompilerHintsOffset));
272+
__ lwu(t2, FieldMemOperand(t2, SharedFunctionInfo::kFlagsOffset));
273273
__ And(t2, t2, Operand(SharedFunctionInfo::IsDerivedConstructorBit::kMask));
274274
__ Branch(&not_create_implicit_receiver, ne, t2, Operand(zero_reg));
275275

@@ -390,7 +390,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
390390
__ bind(&other_result);
391391
__ Ld(a1, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
392392
__ Ld(t2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
393-
__ lwu(t2, FieldMemOperand(t2, SharedFunctionInfo::kCompilerHintsOffset));
393+
__ lwu(t2, FieldMemOperand(t2, SharedFunctionInfo::kFlagsOffset));
394394
__ And(t2, t2, Operand(SharedFunctionInfo::IsClassConstructorBit::kMask));
395395

396396
if (restrict_constructor_return) {
@@ -2021,7 +2021,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
20212021
// Check that function is not a "classConstructor".
20222022
Label class_constructor;
20232023
__ Ld(a2, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
2024-
__ Lwu(a3, FieldMemOperand(a2, SharedFunctionInfo::kCompilerHintsOffset));
2024+
__ Lwu(a3, FieldMemOperand(a2, SharedFunctionInfo::kFlagsOffset));
20252025
__ And(at, a3, Operand(SharedFunctionInfo::IsClassConstructorBit::kMask));
20262026
__ Branch(&class_constructor, ne, at, Operand(zero_reg));
20272027

@@ -2031,7 +2031,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
20312031
__ Ld(cp, FieldMemOperand(a1, JSFunction::kContextOffset));
20322032
// We need to convert the receiver for non-native sloppy mode functions.
20332033
Label done_convert;
2034-
__ Lwu(a3, FieldMemOperand(a2, SharedFunctionInfo::kCompilerHintsOffset));
2034+
__ Lwu(a3, FieldMemOperand(a2, SharedFunctionInfo::kFlagsOffset));
20352035
__ And(at, a3,
20362036
Operand(SharedFunctionInfo::IsNativeBit::kMask |
20372037
SharedFunctionInfo::IsStrictBit::kMask));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
276276
// -----------------------------------
277277

278278
__ LoadP(r7, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
279-
__ lwz(r7, FieldMemOperand(r7, SharedFunctionInfo::kCompilerHintsOffset));
279+
__ lwz(r7, FieldMemOperand(r7, SharedFunctionInfo::kFlagsOffset));
280280
__ TestBitMask(r7, SharedFunctionInfo::IsDerivedConstructorBit::kMask, r0);
281281
__ bne(&not_create_implicit_receiver, cr0);
282282

@@ -403,7 +403,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
403403
// Throw if constructor function is a class constructor
404404
__ LoadP(r7, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
405405
__ LoadP(r7, FieldMemOperand(r7, JSFunction::kSharedFunctionInfoOffset));
406-
__ lwz(r7, FieldMemOperand(r7, SharedFunctionInfo::kCompilerHintsOffset));
406+
__ lwz(r7, FieldMemOperand(r7, SharedFunctionInfo::kFlagsOffset));
407407
__ TestBitMask(r7, SharedFunctionInfo::IsClassConstructorBit::kMask, r0);
408408
__ beq(&use_receiver, cr0);
409409

@@ -2064,7 +2064,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
20642064
// Check that the function is not a "classConstructor".
20652065
Label class_constructor;
20662066
__ LoadP(r5, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
2067-
__ lwz(r6, FieldMemOperand(r5, SharedFunctionInfo::kCompilerHintsOffset));
2067+
__ lwz(r6, FieldMemOperand(r5, SharedFunctionInfo::kFlagsOffset));
20682068
__ TestBitMask(r6, SharedFunctionInfo::IsClassConstructorBit::kMask, r0);
20692069
__ bne(&class_constructor, cr0);
20702070

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
279279
// -----------------------------------
280280

281281
__ LoadP(r6, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
282-
__ LoadlW(r6,
283-
FieldMemOperand(r6, SharedFunctionInfo::kCompilerHintsOffset));
282+
__ LoadlW(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
284283
__ TestBitMask(r6, SharedFunctionInfo::IsDerivedConstructorBit::kMask, r0);
285284
__ bne(&not_create_implicit_receiver);
286285

@@ -405,8 +404,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
405404
// Throw if constructor function is a class constructor
406405
__ LoadP(r6, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
407406
__ LoadP(r6, FieldMemOperand(r6, JSFunction::kSharedFunctionInfoOffset));
408-
__ LoadlW(r6,
409-
FieldMemOperand(r6, SharedFunctionInfo::kCompilerHintsOffset));
407+
__ LoadlW(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
410408
__ TestBitMask(r6, SharedFunctionInfo::IsClassConstructorBit::kMask, r0);
411409
__ beq(&use_receiver);
412410
} else {
@@ -2071,7 +2069,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
20712069
// Check that the function is not a "classConstructor".
20722070
Label class_constructor;
20732071
__ LoadP(r4, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
2074-
__ LoadlW(r5, FieldMemOperand(r4, SharedFunctionInfo::kCompilerHintsOffset));
2072+
__ LoadlW(r5, FieldMemOperand(r4, SharedFunctionInfo::kFlagsOffset));
20752073
__ TestBitMask(r5, SharedFunctionInfo::IsClassConstructorBit::kMask, r0);
20762074
__ bne(&class_constructor);
20772075

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
221221
// -----------------------------------
222222

223223
__ movp(rbx, FieldOperand(rdi, JSFunction::kSharedFunctionInfoOffset));
224-
__ testl(FieldOperand(rbx, SharedFunctionInfo::kCompilerHintsOffset),
224+
__ testl(FieldOperand(rbx, SharedFunctionInfo::kFlagsOffset),
225225
Immediate(SharedFunctionInfo::IsDerivedConstructorBit::kMask));
226226
__ j(not_zero, &not_create_implicit_receiver, Label::kNear);
227227

@@ -341,7 +341,7 @@ void Generate_JSConstructStubGeneric(MacroAssembler* masm,
341341
__ bind(&other_result);
342342
__ movp(rbx, Operand(rbp, ConstructFrameConstants::kConstructorOffset));
343343
__ movp(rbx, FieldOperand(rbx, JSFunction::kSharedFunctionInfoOffset));
344-
__ testl(FieldOperand(rbx, SharedFunctionInfo::kCompilerHintsOffset),
344+
__ testl(FieldOperand(rbx, SharedFunctionInfo::kFlagsOffset),
345345
Immediate(SharedFunctionInfo::IsClassConstructorBit::kMask));
346346

347347
if (restrict_constructor_return) {
@@ -2223,7 +2223,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
22232223
// Check that the function is not a "classConstructor".
22242224
Label class_constructor;
22252225
__ movp(rdx, FieldOperand(rdi, JSFunction::kSharedFunctionInfoOffset));
2226-
__ testl(FieldOperand(rdx, SharedFunctionInfo::kCompilerHintsOffset),
2226+
__ testl(FieldOperand(rdx, SharedFunctionInfo::kFlagsOffset),
22272227
Immediate(SharedFunctionInfo::IsClassConstructorBit::kMask));
22282228
__ j(not_zero, &class_constructor);
22292229

@@ -2239,7 +2239,7 @@ void Builtins::Generate_CallFunction(MacroAssembler* masm,
22392239
__ movp(rsi, FieldOperand(rdi, JSFunction::kContextOffset));
22402240
// We need to convert the receiver for non-native sloppy mode functions.
22412241
Label done_convert;
2242-
__ testl(FieldOperand(rdx, SharedFunctionInfo::kCompilerHintsOffset),
2242+
__ testl(FieldOperand(rdx, SharedFunctionInfo::kFlagsOffset),
22432243
Immediate(SharedFunctionInfo::IsNativeBit::kMask |
22442244
SharedFunctionInfo::IsStrictBit::kMask));
22452245
__ j(not_zero, &done_convert);

‎src/compiler-dispatcher/unoptimized-compile-job.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void UnoptimizedCompileJob::PrepareOnMainThread(Isolate* isolate) {
193193
}
194194
parse_info_->set_hash_seed(isolate->heap()->HashSeed());
195195
parse_info_->set_is_named_expression(shared_->is_named_expression());
196-
parse_info_->set_compiler_hints(shared_->compiler_hints());
196+
parse_info_->set_function_flags(shared_->flags());
197197
parse_info_->set_start_position(shared_->StartPosition());
198198
parse_info_->set_end_position(shared_->EndPosition());
199199
parse_info_->set_unicode_cache(unicode_cache_.get());

0 commit comments

Comments
 (0)