Index: src/compiler/simplified-lowering.cc |
diff --git a/src/compiler/simplified-lowering.cc b/src/compiler/simplified-lowering.cc |
index d7157f6bf04005be6feaf2396bdf25454fade664..e334d1faefca41cffcc6172d445884b0c9f6b39e 100644 |
--- a/src/compiler/simplified-lowering.cc |
+++ b/src/compiler/simplified-lowering.cc |
@@ -76,7 +76,7 @@ class RepresentationSelector { |
queue_(zone) { |
memset(info_, 0, sizeof(NodeInfo) * count_); |
- Factory* f = zone->isolate()->factory(); |
+ Factory* f = jsgraph->isolate()->factory(); |
safe_int_additive_range_ = |
Type::Range(f->NewNumber(-std::pow(2.0, 52.0)), |
f->NewNumber(std::pow(2.0, 52.0)), zone); |
@@ -530,7 +530,8 @@ class RepresentationSelector { |
jsgraph_->isolate(), ToBooleanStub::RESULT_AS_ODDBALL); |
CallDescriptor::Flags flags = CallDescriptor::kPatchableCallSite; |
CallDescriptor* desc = Linkage::GetStubCallDescriptor( |
- callable.descriptor(), 0, flags, properties, jsgraph_->zone()); |
+ jsgraph_->isolate(), jsgraph_->zone(), callable.descriptor(), 0, |
+ flags, properties); |
node->set_op(jsgraph_->common()->Call(desc)); |
node->InsertInput(jsgraph_->zone(), 0, |
jsgraph_->HeapConstant(callable.code())); |
@@ -740,7 +741,8 @@ class RepresentationSelector { |
Callable callable = CodeFactory::ToNumber(jsgraph_->isolate()); |
CallDescriptor::Flags flags = CallDescriptor::kNoFlags; |
CallDescriptor* desc = Linkage::GetStubCallDescriptor( |
- callable.descriptor(), 0, flags, properties, jsgraph_->zone()); |
+ jsgraph_->isolate(), jsgraph_->zone(), callable.descriptor(), 0, |
+ flags, properties); |
node->set_op(jsgraph_->common()->Call(desc)); |
node->InsertInput(jsgraph_->zone(), 0, |
jsgraph_->HeapConstant(callable.code())); |
@@ -1089,8 +1091,7 @@ Node* SimplifiedLowering::IsTagged(Node* node) { |
void SimplifiedLowering::LowerAllNodes() { |
SimplifiedOperatorBuilder simplified(graph()->zone()); |
- RepresentationChanger changer(jsgraph(), &simplified, |
- graph()->zone()->isolate()); |
+ RepresentationChanger changer(jsgraph(), &simplified, jsgraph()->isolate()); |
RepresentationSelector selector(jsgraph(), zone_, &changer); |
selector.Run(this); |
} |
@@ -1255,10 +1256,11 @@ void SimplifiedLowering::DoStoreElement(Node* node) { |
void SimplifiedLowering::DoStringAdd(Node* node) { |
Operator::Properties properties = node->op()->properties(); |
Callable callable = CodeFactory::StringAdd( |
- zone()->isolate(), STRING_ADD_CHECK_NONE, NOT_TENURED); |
+ jsgraph()->isolate(), STRING_ADD_CHECK_NONE, NOT_TENURED); |
CallDescriptor::Flags flags = CallDescriptor::kNoFlags; |
CallDescriptor* desc = Linkage::GetStubCallDescriptor( |
- callable.descriptor(), 0, flags, properties, zone()); |
+ jsgraph()->isolate(), zone(), callable.descriptor(), 0, flags, |
+ properties); |
node->set_op(common()->Call(desc)); |
node->InsertInput(graph()->zone(), 0, |
jsgraph()->HeapConstant(callable.code())); |
@@ -1269,14 +1271,14 @@ void SimplifiedLowering::DoStringAdd(Node* node) { |
Node* SimplifiedLowering::StringComparison(Node* node, bool requires_ordering) { |
- CEntryStub stub(zone()->isolate(), 1); |
+ CEntryStub stub(jsgraph()->isolate(), 1); |
Runtime::FunctionId f = |
requires_ordering ? Runtime::kStringCompare : Runtime::kStringEquals; |
- ExternalReference ref(f, zone()->isolate()); |
+ ExternalReference ref(f, jsgraph()->isolate()); |
Operator::Properties props = node->op()->properties(); |
// TODO(mstarzinger): We should call StringCompareStub here instead, once an |
// interface descriptor is available for it. |
- CallDescriptor* desc = Linkage::GetRuntimeCallDescriptor(f, 2, props, zone()); |
+ CallDescriptor* desc = Linkage::GetRuntimeCallDescriptor(zone(), f, 2, props); |
return graph()->NewNode(common()->Call(desc), |
jsgraph()->HeapConstant(stub.GetCode()), |
NodeProperties::GetValueInput(node, 0), |