Skip to content

Commit 7a159da

Browse files
isheludkoCommit Bot
isheludko
authored and
Commit Bot
committed
[runtime] Cleanup Map fields and bit fields definitions.
Bug: v8:7109 Change-Id: I9766d28998fca49b0d3e6dc9aca3cc19f0b42124 Reviewed-on: https://chromium-review.googlesource.com/809244 Reviewed-by: Michael Starzinger <[email protected]> Reviewed-by: Ulan Degenbaev <[email protected]> Reviewed-by: Jaroslav Sevcik <[email protected]> Reviewed-by: Camillo Bruni <[email protected]> Commit-Queue: Igor Sheludko <[email protected]> Cr-Commit-Position: refs/heads/master@{#49925}
1 parent 9a91669 commit 7a159da

24 files changed

Lines changed: 271 additions & 377 deletions

‎src/api-natives.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ Handle<JSFunction> ApiNatives::CreateApiFunction(
705705
// that is undetectable but not callable, we need to update the types.h
706706
// to allow encoding this.
707707
CHECK(!obj->instance_call_handler()->IsUndefined(isolate));
708-
map->set_is_undetectable();
708+
map->set_is_undetectable(true);
709709
}
710710

711711
// Mark as needs_access_check if needed.
@@ -716,20 +716,20 @@ Handle<JSFunction> ApiNatives::CreateApiFunction(
716716

717717
// Set interceptor information in the map.
718718
if (!obj->named_property_handler()->IsUndefined(isolate)) {
719-
map->set_has_named_interceptor();
719+
map->set_has_named_interceptor(true);
720720
map->set_may_have_interesting_symbols(true);
721721
}
722722
if (!obj->indexed_property_handler()->IsUndefined(isolate)) {
723-
map->set_has_indexed_interceptor();
723+
map->set_has_indexed_interceptor(true);
724724
}
725725

726726
// Mark instance as callable in the map.
727727
if (!obj->instance_call_handler()->IsUndefined(isolate)) {
728-
map->set_is_callable();
728+
map->set_is_callable(true);
729729
map->set_is_constructor(true);
730730
}
731731

732-
if (immutable_proto) map->set_immutable_proto(true);
732+
if (immutable_proto) map->set_is_immutable_proto(true);
733733

734734
return result;
735735
}

‎src/bootstrapper.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ void Genesis::CreateObjectFunction(Handle<JSFunction> empty_function) {
780780
"EmptyObjectPrototype");
781781
map->set_is_prototype_map(true);
782782
// Ban re-setting Object.prototype.__proto__ to prevent Proxy security bug
783-
map->set_immutable_proto(true);
783+
map->set_is_immutable_proto(true);
784784
object_function_prototype->set_map(*map);
785785

786786
// Complete setting up empty function.
@@ -1073,12 +1073,12 @@ void Genesis::CreateJSProxyMaps() {
10731073
// constructable proxies.
10741074
Handle<Map> proxy_map = factory()->NewMap(JS_PROXY_TYPE, JSProxy::kSize,
10751075
TERMINAL_FAST_ELEMENTS_KIND);
1076-
proxy_map->set_dictionary_map(true);
1076+
proxy_map->set_is_dictionary_map(true);
10771077
proxy_map->set_may_have_interesting_symbols(true);
10781078
native_context()->set_proxy_map(*proxy_map);
10791079

10801080
Handle<Map> proxy_callable_map = Map::Copy(proxy_map, "callable Proxy");
1081-
proxy_callable_map->set_is_callable();
1081+
proxy_callable_map->set_is_callable(true);
10821082
native_context()->set_proxy_callable_map(*proxy_callable_map);
10831083
proxy_callable_map->SetConstructor(native_context()->function_function());
10841084

@@ -1227,7 +1227,7 @@ Handle<JSGlobalObject> Genesis::CreateNewGlobals(
12271227
}
12281228

12291229
js_global_object_function->initial_map()->set_is_prototype_map(true);
1230-
js_global_object_function->initial_map()->set_dictionary_map(true);
1230+
js_global_object_function->initial_map()->set_is_dictionary_map(true);
12311231
js_global_object_function->initial_map()->set_may_have_interesting_symbols(
12321232
true);
12331233
Handle<JSGlobalObject> global_object =
@@ -3475,7 +3475,7 @@ void Genesis::InitializeGlobal(Handle<JSGlobalObject> global_object,
34753475
factory->NewMap(JS_BOUND_FUNCTION_TYPE, JSBoundFunction::kSize,
34763476
TERMINAL_FAST_ELEMENTS_KIND, 0);
34773477
map->SetConstructor(native_context()->object_function());
3478-
map->set_is_callable();
3478+
map->set_is_callable(true);
34793479
Map::SetPrototype(map, empty_function);
34803480

34813481
PropertyAttributes roc_attribs =
@@ -4847,7 +4847,7 @@ bool Genesis::InstallNatives(GlobalContextType context_type) {
48474847
initial_map->SetConstructor(*array_constructor);
48484848

48494849
// Set prototype on map.
4850-
initial_map->set_non_instance_prototype(false);
4850+
initial_map->set_has_non_instance_prototype(false);
48514851
Map::SetPrototype(initial_map, array_prototype);
48524852

48534853
// Update map with length accessor from Array and add "index" and "input".

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
18901890
__ JumpIfSmi(r3, &new_target_not_constructor);
18911891
__ ldr(scratch, FieldMemOperand(r3, HeapObject::kMapOffset));
18921892
__ ldrb(scratch, FieldMemOperand(scratch, Map::kBitFieldOffset));
1893-
__ tst(scratch, Operand(1 << Map::kIsConstructor));
1893+
__ tst(scratch, Operand(Map::IsConstructorBit::kMask));
18941894
__ b(ne, &new_target_constructor);
18951895
__ bind(&new_target_not_constructor);
18961896
{
@@ -2179,7 +2179,7 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) {
21792179

21802180
// Check if target has a [[Call]] internal method.
21812181
__ ldrb(r4, FieldMemOperand(r4, Map::kBitFieldOffset));
2182-
__ tst(r4, Operand(1 << Map::kIsCallable));
2182+
__ tst(r4, Operand(Map::IsCallableBit::kMask));
21832183
__ b(eq, &non_callable);
21842184

21852185
// Check if target is a proxy and call CallProxy external builtin
@@ -2269,7 +2269,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
22692269

22702270
// Check if target has a [[Construct]] internal method.
22712271
__ ldrb(r2, FieldMemOperand(r4, Map::kBitFieldOffset));
2272-
__ tst(r2, Operand(1 << Map::kIsConstructor));
2272+
__ tst(r2, Operand(Map::IsConstructorBit::kMask));
22732273
__ b(eq, &non_constructor);
22742274

22752275
// Only dispatch to bound functions after checking whether they are

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,7 +2165,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
21652165
__ JumpIfSmi(x3, &new_target_not_constructor);
21662166
__ Ldr(x5, FieldMemOperand(x3, HeapObject::kMapOffset));
21672167
__ Ldrb(x5, FieldMemOperand(x5, Map::kBitFieldOffset));
2168-
__ TestAndBranchIfAnySet(x5, 1 << Map::kIsConstructor,
2168+
__ TestAndBranchIfAnySet(x5, Map::IsConstructorBit::kMask,
21692169
&new_target_constructor);
21702170
__ Bind(&new_target_not_constructor);
21712171
{
@@ -2439,7 +2439,7 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) {
24392439

24402440
// Check if target has a [[Call]] internal method.
24412441
__ Ldrb(x4, FieldMemOperand(x4, Map::kBitFieldOffset));
2442-
__ TestAndBranchIfAllClear(x4, 1 << Map::kIsCallable, &non_callable);
2442+
__ TestAndBranchIfAllClear(x4, Map::IsCallableBit::kMask, &non_callable);
24432443

24442444
// Check if target is a proxy and call CallProxy external builtin
24452445
__ Cmp(x5, JS_PROXY_TYPE);
@@ -2534,7 +2534,8 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
25342534

25352535
// Check if target has a [[Construct]] internal method.
25362536
__ Ldrb(x2, FieldMemOperand(x4, Map::kBitFieldOffset));
2537-
__ TestAndBranchIfAllClear(x2, 1 << Map::kIsConstructor, &non_constructor);
2537+
__ TestAndBranchIfAllClear(x2, Map::IsConstructorBit::kMask,
2538+
&non_constructor);
25382539

25392540
// Only dispatch to bound functions after checking whether they are
25402541
// constructors.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,10 @@ Node* ConstructorBuiltinsAssembler::EmitCreateShallowObjectLiteral(
458458
VARIABLE(var_properties, MachineRepresentation::kTagged);
459459
{
460460
Node* bit_field_3 = LoadMapBitField3(boilerplate_map);
461-
GotoIf(IsSetWord32<Map::Deprecated>(bit_field_3), call_runtime);
461+
GotoIf(IsSetWord32<Map::IsDeprecatedBit>(bit_field_3), call_runtime);
462462
// Directly copy over the property store for dict-mode boilerplates.
463463
Label if_dictionary(this), if_fast(this), done(this);
464-
Branch(IsSetWord32<Map::DictionaryMap>(bit_field_3), &if_dictionary,
464+
Branch(IsSetWord32<Map::IsDictionaryMapBit>(bit_field_3), &if_dictionary,
465465
&if_fast);
466466
BIND(&if_dictionary);
467467
{
@@ -637,8 +637,8 @@ Node* ConstructorBuiltinsAssembler::EmitCreateEmptyObjectLiteral(
637637
CSA_ASSERT(this, IsMap(map));
638638
// Ensure that slack tracking is disabled for the map.
639639
STATIC_ASSERT(Map::kNoSlackTracking == 0);
640-
CSA_ASSERT(this,
641-
IsClearWord32<Map::ConstructionCounter>(LoadMapBitField3(map)));
640+
CSA_ASSERT(
641+
this, IsClearWord32<Map::ConstructionCounterBits>(LoadMapBitField3(map)));
642642
Node* empty_fixed_array = EmptyFixedArrayConstant();
643643
Node* result =
644644
AllocateJSObjectFromMap(map, empty_fixed_array, empty_fixed_array);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ TF_BUILTIN(ObjectPrototypeToString, ObjectBuiltinsAssembler) {
550550
GotoIf(IsNull(holder), &return_default);
551551
Node* holder_map = LoadMap(holder);
552552
Node* holder_bit_field3 = LoadMapBitField3(holder_map);
553-
GotoIf(IsSetWord32<Map::MayHaveInterestingSymbols>(holder_bit_field3),
553+
GotoIf(IsSetWord32<Map::MayHaveInterestingSymbolsBit>(holder_bit_field3),
554554
&return_generic);
555555
var_holder.Bind(LoadMapPrototype(holder_map));
556556
Goto(&loop);
@@ -615,7 +615,7 @@ TF_BUILTIN(ObjectCreate, ObjectBuiltinsAssembler) {
615615
&call_runtime);
616616
// Handle dictionary objects or fast objects with properties in runtime.
617617
Node* bit_field3 = LoadMapBitField3(properties_map);
618-
GotoIf(IsSetWord32<Map::DictionaryMap>(bit_field3), &call_runtime);
618+
GotoIf(IsSetWord32<Map::IsDictionaryMapBit>(bit_field3), &call_runtime);
619619
Branch(IsSetWord32<Map::NumberOfOwnDescriptorsBits>(bit_field3),
620620
&call_runtime, &no_properties);
621621
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
19851985
__ JumpIfSmi(edx, &new_target_not_constructor, Label::kNear);
19861986
__ mov(ebx, FieldOperand(edx, HeapObject::kMapOffset));
19871987
__ test_b(FieldOperand(ebx, Map::kBitFieldOffset),
1988-
Immediate(1 << Map::kIsConstructor));
1988+
Immediate(Map::IsConstructorBit::kMask));
19891989
__ j(not_zero, &new_target_constructor, Label::kNear);
19901990
__ bind(&new_target_not_constructor);
19911991
{
@@ -2299,7 +2299,7 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) {
22992299

23002300
// Check if target is a proxy and call CallProxy external builtin
23012301
__ test_b(FieldOperand(ecx, Map::kBitFieldOffset),
2302-
Immediate(1 << Map::kIsCallable));
2302+
Immediate(Map::IsCallableBit::kMask));
23032303
__ j(zero, &non_callable);
23042304

23052305
// Call CallProxy external builtin
@@ -2394,7 +2394,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
23942394

23952395
// Check if target has a [[Construct]] internal method.
23962396
__ test_b(FieldOperand(ecx, Map::kBitFieldOffset),
2397-
Immediate(1 << Map::kIsConstructor));
2397+
Immediate(Map::IsConstructorBit::kMask));
23982398
__ j(zero, &non_constructor, Label::kNear);
23992399

24002400
// Only dispatch to bound functions after checking whether they are

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
18941894
__ JumpIfSmi(a3, &new_target_not_constructor);
18951895
__ lw(t1, FieldMemOperand(a3, HeapObject::kMapOffset));
18961896
__ lbu(t1, FieldMemOperand(t1, Map::kBitFieldOffset));
1897-
__ And(t1, t1, Operand(1 << Map::kIsConstructor));
1897+
__ And(t1, t1, Operand(Map::IsConstructorBit::kMask));
18981898
__ Branch(&new_target_constructor, ne, t1, Operand(zero_reg));
18991899
__ bind(&new_target_not_constructor);
19001900
{
@@ -2168,7 +2168,7 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) {
21682168

21692169
// Check if target has a [[Call]] internal method.
21702170
__ lbu(t1, FieldMemOperand(t1, Map::kBitFieldOffset));
2171-
__ And(t1, t1, Operand(1 << Map::kIsCallable));
2171+
__ And(t1, t1, Operand(Map::IsCallableBit::kMask));
21722172
__ Branch(&non_callable, eq, t1, Operand(zero_reg));
21732173

21742174
// Check if target is a proxy and call CallProxy external builtin
@@ -2324,7 +2324,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
23242324

23252325
// Check if target has a [[Construct]] internal method.
23262326
__ lbu(t3, FieldMemOperand(t1, Map::kBitFieldOffset));
2327-
__ And(t3, t3, Operand(1 << Map::kIsConstructor));
2327+
__ And(t3, t3, Operand(Map::IsConstructorBit::kMask));
23282328
__ Branch(&non_constructor, eq, t3, Operand(zero_reg));
23292329

23302330
// Only dispatch to bound functions after checking whether they are

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
19181918
__ JumpIfSmi(a3, &new_target_not_constructor);
19191919
__ ld(t1, FieldMemOperand(a3, HeapObject::kMapOffset));
19201920
__ lbu(t1, FieldMemOperand(t1, Map::kBitFieldOffset));
1921-
__ And(t1, t1, Operand(1 << Map::kIsConstructor));
1921+
__ And(t1, t1, Operand(Map::IsConstructorBit::kMask));
19221922
__ Branch(&new_target_constructor, ne, t1, Operand(zero_reg));
19231923
__ bind(&new_target_not_constructor);
19241924
{
@@ -2190,7 +2190,7 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) {
21902190

21912191
// Check if target has a [[Call]] internal method.
21922192
__ Lbu(t1, FieldMemOperand(t1, Map::kBitFieldOffset));
2193-
__ And(t1, t1, Operand(1 << Map::kIsCallable));
2193+
__ And(t1, t1, Operand(Map::IsCallableBit::kMask));
21942194
__ Branch(&non_callable, eq, t1, Operand(zero_reg));
21952195

21962196
__ Branch(&non_function, ne, t2, Operand(JS_PROXY_TYPE));
@@ -2343,7 +2343,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
23432343

23442344
// Check if target has a [[Construct]] internal method.
23452345
__ Lbu(t3, FieldMemOperand(t1, Map::kBitFieldOffset));
2346-
__ And(t3, t3, Operand(1 << Map::kIsConstructor));
2346+
__ And(t3, t3, Operand(Map::IsConstructorBit::kMask));
23472347
__ Branch(&non_constructor, eq, t3, Operand(zero_reg));
23482348

23492349
// Only dispatch to bound functions after checking whether they are

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2120,7 +2120,7 @@ void Builtins::Generate_CallOrConstructForwardVarargs(MacroAssembler* masm,
21202120
__ JumpIfSmi(rdx, &new_target_not_constructor, Label::kNear);
21212121
__ movp(rbx, FieldOperand(rdx, HeapObject::kMapOffset));
21222122
__ testb(FieldOperand(rbx, Map::kBitFieldOffset),
2123-
Immediate(1 << Map::kIsConstructor));
2123+
Immediate(Map::IsConstructorBit::kMask));
21242124
__ j(not_zero, &new_target_constructor, Label::kNear);
21252125
__ bind(&new_target_not_constructor);
21262126
{
@@ -2424,7 +2424,7 @@ void Builtins::Generate_Call(MacroAssembler* masm, ConvertReceiverMode mode) {
24242424

24252425
// Check if target has a [[Call]] internal method.
24262426
__ testb(FieldOperand(rcx, Map::kBitFieldOffset),
2427-
Immediate(1 << Map::kIsCallable));
2427+
Immediate(Map::IsCallableBit::kMask));
24282428
__ j(zero, &non_callable);
24292429

24302430
// Check if target is a proxy and call CallProxy external builtin
@@ -2521,7 +2521,7 @@ void Builtins::Generate_Construct(MacroAssembler* masm) {
25212521

25222522
// Check if target has a [[Construct]] internal method.
25232523
__ testb(FieldOperand(rcx, Map::kBitFieldOffset),
2524-
Immediate(1 << Map::kIsConstructor));
2524+
Immediate(Map::IsConstructorBit::kMask));
25252525
__ j(zero, &non_constructor, Label::kNear);
25262526

25272527
// Only dispatch to bound functions after checking whether they are

0 commit comments

Comments
 (0)