From 9850002401e41d6354001929ee520bdf5a20032f Mon Sep 17 00:00:00 2001 From: Santiago Aboy Solanes Date: Fri, 17 May 2019 13:46:19 +0100 Subject: [PATCH] [ptr-compr][cleanup] Removing AccessBuilder::ForCompressedMap Now that we introduced the Compressed representation, we can simply use AccessBuilder::ForMap. AccessBuilder::ForCompressedMap was introduced as a placeholder previously. Cq-Include-Trybots: luci.v8.try:v8_linux64_pointer_compression_rel_ng Cq-Include-Trybots: luci.v8.try:v8_linux64_arm64_pointer_compression_rel_ng Bug: v8:8977, v8:7703 Change-Id: I15b559c27641e6a673862c86be176e259835308e Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1617664 Reviewed-by: Michael Stanton Commit-Queue: Santiago Aboy Solanes Cr-Commit-Position: refs/heads/master@{#61645} --- src/compiler/access-builder.cc | 12 ------------ src/compiler/access-builder.h | 2 -- src/compiler/effect-control-linearizer.cc | 9 ++------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/compiler/access-builder.cc b/src/compiler/access-builder.cc index 3d87cf09cf..f92fd6a611 100644 --- a/src/compiler/access-builder.cc +++ b/src/compiler/access-builder.cc @@ -53,18 +53,6 @@ FieldAccess AccessBuilder::ForMap() { return access; } -// static -FieldAccess AccessBuilder::ForCompressedMap() { - FieldAccess access = {kTaggedBase, HeapObject::kMapOffset, - MaybeHandle(), MaybeHandle(), - // We use MachineType::Uint32() for the compressed - // pointer load, because we want to examine it - // as a compressed pointer in map checks. - Type::OtherInternal(), MachineType::Uint32(), - kMapWriteBarrier, LoadSensitivity::kUnsafe}; - return access; -} - // static FieldAccess AccessBuilder::ForHeapNumberValue() { FieldAccess access = { diff --git a/src/compiler/access-builder.h b/src/compiler/access-builder.h index 693f097536..a1698a6b76 100644 --- a/src/compiler/access-builder.h +++ b/src/compiler/access-builder.h @@ -36,8 +36,6 @@ class V8_EXPORT_PRIVATE AccessBuilder final // Provides access to HeapObject::map() field. static FieldAccess ForMap(); - static FieldAccess ForCompressedMap(); - // Provides access to HeapNumber::value() field. static FieldAccess ForHeapNumberValue(); diff --git a/src/compiler/effect-control-linearizer.cc b/src/compiler/effect-control-linearizer.cc index 5f3d12a5d5..3d4def69ae 100644 --- a/src/compiler/effect-control-linearizer.cc +++ b/src/compiler/effect-control-linearizer.cc @@ -1808,10 +1808,7 @@ void EffectControlLinearizer::LowerCheckMaps(Node* node, Node* frame_state) { auto done = __ MakeLabel(); // Load the current map of the {value}. - Node* value_map = - UsingCompressedPointers() - ? __ LoadField(AccessBuilder::ForCompressedMap(), value) - : __ LoadField(AccessBuilder::ForMap(), value); + Node* value_map = __ LoadField(AccessBuilder::ForMap(), value); for (size_t i = 0; i < map_count; ++i) { Node* check; @@ -1851,9 +1848,7 @@ Node* EffectControlLinearizer::LowerCompareMaps(Node* node) { auto done = __ MakeLabel(MachineRepresentation::kBit); // Load the current map of the {value}. - Node* value_map = UsingCompressedPointers() - ? __ LoadField(AccessBuilder::ForCompressedMap(), value) - : __ LoadField(AccessBuilder::ForMap(), value); + Node* value_map = __ LoadField(AccessBuilder::ForMap(), value); for (size_t i = 0; i < map_count; ++i) { Node* check;