Commit 4fc7d17b authored by Benedikt Meurer's avatar Benedikt Meurer Committed by Commit Bot

[turbofan] Make New*Elements operator naming consistent.

We no longer use the terminology "fast elements", so drop the "Fast"
from both NewFastSmiOrObjectElements and NewFastDoubleElements operator
names.

Bug: v8:6399, v8:6901
Tbr: jarin@chromium.org
Change-Id: Icc204623f2b459b0d0e172e26ddd73e29fe6c884
Reviewed-on: https://chromium-review.googlesource.com/707246Reviewed-by: 's avatarBenedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Benedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48399}
parent edc219cb
...@@ -810,11 +810,11 @@ bool EffectControlLinearizer::TryWireInStateEffect(Node* node, ...@@ -810,11 +810,11 @@ bool EffectControlLinearizer::TryWireInStateEffect(Node* node,
case IrOpcode::kArgumentsLength: case IrOpcode::kArgumentsLength:
result = LowerArgumentsLength(node); result = LowerArgumentsLength(node);
break; break;
case IrOpcode::kNewFastDoubleElements: case IrOpcode::kNewDoubleElements:
result = LowerNewFastDoubleElements(node); result = LowerNewDoubleElements(node);
break; break;
case IrOpcode::kNewFastSmiOrObjectElements: case IrOpcode::kNewSmiOrObjectElements:
result = LowerNewFastSmiOrObjectElements(node); result = LowerNewSmiOrObjectElements(node);
break; break;
case IrOpcode::kNewArgumentsElements: case IrOpcode::kNewArgumentsElements:
result = LowerNewArgumentsElements(node); result = LowerNewArgumentsElements(node);
...@@ -2281,7 +2281,7 @@ Node* EffectControlLinearizer::LowerArgumentsFrame(Node* node) { ...@@ -2281,7 +2281,7 @@ Node* EffectControlLinearizer::LowerArgumentsFrame(Node* node) {
return done.PhiAt(0); return done.PhiAt(0);
} }
Node* EffectControlLinearizer::LowerNewFastDoubleElements(Node* node) { Node* EffectControlLinearizer::LowerNewDoubleElements(Node* node) {
PretenureFlag const pretenure = PretenureFlagOf(node->op()); PretenureFlag const pretenure = PretenureFlagOf(node->op());
Node* length = node->InputAt(0); Node* length = node->InputAt(0);
...@@ -2328,7 +2328,7 @@ Node* EffectControlLinearizer::LowerNewFastDoubleElements(Node* node) { ...@@ -2328,7 +2328,7 @@ Node* EffectControlLinearizer::LowerNewFastDoubleElements(Node* node) {
return result; return result;
} }
Node* EffectControlLinearizer::LowerNewFastSmiOrObjectElements(Node* node) { Node* EffectControlLinearizer::LowerNewSmiOrObjectElements(Node* node) {
PretenureFlag const pretenure = PretenureFlagOf(node->op()); PretenureFlag const pretenure = PretenureFlagOf(node->op());
Node* length = node->InputAt(0); Node* length = node->InputAt(0);
......
...@@ -98,8 +98,8 @@ class V8_EXPORT_PRIVATE EffectControlLinearizer { ...@@ -98,8 +98,8 @@ class V8_EXPORT_PRIVATE EffectControlLinearizer {
Node* LowerObjectIsUndetectable(Node* node); Node* LowerObjectIsUndetectable(Node* node);
Node* LowerArgumentsFrame(Node* node); Node* LowerArgumentsFrame(Node* node);
Node* LowerArgumentsLength(Node* node); Node* LowerArgumentsLength(Node* node);
Node* LowerNewFastDoubleElements(Node* node); Node* LowerNewDoubleElements(Node* node);
Node* LowerNewFastSmiOrObjectElements(Node* node); Node* LowerNewSmiOrObjectElements(Node* node);
Node* LowerNewArgumentsElements(Node* node); Node* LowerNewArgumentsElements(Node* node);
Node* LowerArrayBufferWasNeutered(Node* node); Node* LowerArrayBufferWasNeutered(Node* node);
Node* LowerStringCharAt(Node* node); Node* LowerStringCharAt(Node* node);
......
...@@ -604,11 +604,11 @@ Reduction JSCreateLowering::ReduceNewArray(Node* node, Node* length, ...@@ -604,11 +604,11 @@ Reduction JSCreateLowering::ReduceNewArray(Node* node, Node* length,
control); control);
// Construct elements and properties for the resulting JSArray. // Construct elements and properties for the resulting JSArray.
Node* elements = effect = graph()->NewNode( Node* elements = effect =
IsDoubleElementsKind(initial_map->elements_kind()) graph()->NewNode(IsDoubleElementsKind(initial_map->elements_kind())
? simplified()->NewFastDoubleElements(pretenure) ? simplified()->NewDoubleElements(pretenure)
: simplified()->NewFastSmiOrObjectElements(pretenure), : simplified()->NewSmiOrObjectElements(pretenure),
length, effect, control); length, effect, control);
Node* properties = jsgraph()->EmptyFixedArrayConstant(); Node* properties = jsgraph()->EmptyFixedArrayConstant();
// Perform the allocation of the actual JSArray object. // Perform the allocation of the actual JSArray object.
......
...@@ -369,8 +369,8 @@ ...@@ -369,8 +369,8 @@
V(ObjectIsUndetectable) \ V(ObjectIsUndetectable) \
V(ArgumentsFrame) \ V(ArgumentsFrame) \
V(ArgumentsLength) \ V(ArgumentsLength) \
V(NewFastDoubleElements) \ V(NewDoubleElements) \
V(NewFastSmiOrObjectElements) \ V(NewSmiOrObjectElements) \
V(NewArgumentsElements) \ V(NewArgumentsElements) \
V(ArrayBufferWasNeutered) \ V(ArrayBufferWasNeutered) \
V(EnsureWritableFastElements) \ V(EnsureWritableFastElements) \
......
...@@ -2787,8 +2787,8 @@ class RepresentationSelector { ...@@ -2787,8 +2787,8 @@ class RepresentationSelector {
MachineRepresentation::kTaggedSigned); MachineRepresentation::kTaggedSigned);
return; return;
} }
case IrOpcode::kNewFastDoubleElements: case IrOpcode::kNewDoubleElements:
case IrOpcode::kNewFastSmiOrObjectElements: { case IrOpcode::kNewSmiOrObjectElements: {
VisitUnop(node, UseInfo::TruncatingWord32(), VisitUnop(node, UseInfo::TruncatingWord32(),
MachineRepresentation::kTaggedPointer); MachineRepresentation::kTaggedPointer);
return; return;
......
...@@ -397,8 +397,8 @@ bool operator!=(AllocateParameters const& lhs, AllocateParameters const& rhs) { ...@@ -397,8 +397,8 @@ bool operator!=(AllocateParameters const& lhs, AllocateParameters const& rhs) {
} }
PretenureFlag PretenureFlagOf(const Operator* op) { PretenureFlag PretenureFlagOf(const Operator* op) {
if (op->opcode() == IrOpcode::kNewFastDoubleElements || if (op->opcode() == IrOpcode::kNewDoubleElements ||
op->opcode() == IrOpcode::kNewFastSmiOrObjectElements) { op->opcode() == IrOpcode::kNewSmiOrObjectElements) {
return OpParameter<PretenureFlag>(op); return OpParameter<PretenureFlag>(op);
} }
DCHECK_EQ(IrOpcode::kAllocate, op->opcode()); DCHECK_EQ(IrOpcode::kAllocate, op->opcode());
...@@ -978,22 +978,22 @@ bool IsRestLengthOf(const Operator* op) { ...@@ -978,22 +978,22 @@ bool IsRestLengthOf(const Operator* op) {
return OpParameter<ArgumentsLengthParameters>(op).is_rest_length; return OpParameter<ArgumentsLengthParameters>(op).is_rest_length;
} }
const Operator* SimplifiedOperatorBuilder::NewFastDoubleElements( const Operator* SimplifiedOperatorBuilder::NewDoubleElements(
PretenureFlag pretenure) { PretenureFlag pretenure) {
return new (zone()) Operator1<PretenureFlag>( // -- return new (zone()) Operator1<PretenureFlag>( // --
IrOpcode::kNewFastDoubleElements, // opcode IrOpcode::kNewDoubleElements, // opcode
Operator::kEliminatable, // flags Operator::kEliminatable, // flags
"NewFastDoubleElements", // name "NewDoubleElements", // name
1, 1, 1, 1, 1, 0, // counts 1, 1, 1, 1, 1, 0, // counts
pretenure); // parameter pretenure); // parameter
} }
const Operator* SimplifiedOperatorBuilder::NewFastSmiOrObjectElements( const Operator* SimplifiedOperatorBuilder::NewSmiOrObjectElements(
PretenureFlag pretenure) { PretenureFlag pretenure) {
return new (zone()) Operator1<PretenureFlag>( // -- return new (zone()) Operator1<PretenureFlag>( // --
IrOpcode::kNewFastSmiOrObjectElements, // opcode IrOpcode::kNewSmiOrObjectElements, // opcode
Operator::kEliminatable, // flags Operator::kEliminatable, // flags
"NewFastSmiOrObjectElements", // name "NewSmiOrObjectElements", // name
1, 1, 1, 1, 1, 0, // counts 1, 1, 1, 1, 1, 0, // counts
pretenure); // parameter pretenure); // parameter
} }
......
...@@ -452,8 +452,8 @@ class V8_EXPORT_PRIVATE SimplifiedOperatorBuilder final ...@@ -452,8 +452,8 @@ class V8_EXPORT_PRIVATE SimplifiedOperatorBuilder final
const Operator* ArgumentsLength(int formal_parameter_count, const Operator* ArgumentsLength(int formal_parameter_count,
bool is_rest_length); bool is_rest_length);
const Operator* NewFastDoubleElements(PretenureFlag); const Operator* NewDoubleElements(PretenureFlag);
const Operator* NewFastSmiOrObjectElements(PretenureFlag); const Operator* NewSmiOrObjectElements(PretenureFlag);
// new-arguments-elements arguments-frame, arguments-length // new-arguments-elements arguments-frame, arguments-length
const Operator* NewArgumentsElements(int mapped_count); const Operator* NewArgumentsElements(int mapped_count);
......
...@@ -2040,11 +2040,11 @@ Type* Typer::Visitor::TypeArgumentsFrame(Node* node) { ...@@ -2040,11 +2040,11 @@ Type* Typer::Visitor::TypeArgumentsFrame(Node* node) {
return Type::ExternalPointer(); return Type::ExternalPointer();
} }
Type* Typer::Visitor::TypeNewFastDoubleElements(Node* node) { Type* Typer::Visitor::TypeNewDoubleElements(Node* node) {
return Type::OtherInternal(); return Type::OtherInternal();
} }
Type* Typer::Visitor::TypeNewFastSmiOrObjectElements(Node* node) { Type* Typer::Visitor::TypeNewSmiOrObjectElements(Node* node) {
return Type::OtherInternal(); return Type::OtherInternal();
} }
......
...@@ -1042,8 +1042,8 @@ void Verifier::Visitor::Check(Node* node) { ...@@ -1042,8 +1042,8 @@ void Verifier::Visitor::Check(Node* node) {
case IrOpcode::kArgumentsFrame: case IrOpcode::kArgumentsFrame:
CheckTypeIs(node, Type::ExternalPointer()); CheckTypeIs(node, Type::ExternalPointer());
break; break;
case IrOpcode::kNewFastDoubleElements: case IrOpcode::kNewDoubleElements:
case IrOpcode::kNewFastSmiOrObjectElements: case IrOpcode::kNewSmiOrObjectElements:
CheckValueInputIs(node, 0, CheckValueInputIs(node, 0,
Type::Range(0.0, FixedArray::kMaxLength, zone)); Type::Range(0.0, FixedArray::kMaxLength, zone));
CheckTypeIs(node, Type::OtherInternal()); CheckTypeIs(node, Type::OtherInternal());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment