| Index: src/compiler/js-generic-lowering.cc
|
| diff --git a/src/compiler/js-generic-lowering.cc b/src/compiler/js-generic-lowering.cc
|
| index 7f49fafcbb62812bfe2ef0076a402df9e4b1d3ec..c16aa82bafaad8e3af459df12a8099a7d08a8b61 100644
|
| --- a/src/compiler/js-generic-lowering.cc
|
| +++ b/src/compiler/js-generic-lowering.cc
|
| @@ -19,7 +19,7 @@ namespace compiler {
|
| JSGenericLowering::JSGenericLowering(CompilationInfo* info, JSGraph* jsgraph)
|
| : info_(info),
|
| jsgraph_(jsgraph),
|
| - linkage_(new (jsgraph->zone()) Linkage(info)) {}
|
| + linkage_(new (jsgraph->zone()) Linkage(jsgraph->zone(), info)) {}
|
|
|
|
|
| void JSGenericLowering::PatchOperator(Node* node, const Operator* op) {
|
| @@ -275,8 +275,7 @@ void JSGenericLowering::LowerJSLoadProperty(Node* node) {
|
| const LoadPropertyParameters& p = LoadPropertyParametersOf(node->op());
|
| Callable callable = CodeFactory::KeyedLoadICInOptimizedCode(isolate());
|
| if (FLAG_vector_ics) {
|
| - PatchInsertInput(node, 2,
|
| - jsgraph()->SmiConstant(p.feedback().slot().ToInt()));
|
| + PatchInsertInput(node, 2, jsgraph()->SmiConstant(p.feedback().index()));
|
| PatchInsertInput(node, 3, jsgraph()->HeapConstant(p.feedback().vector()));
|
| }
|
| ReplaceWithStubCall(node, callable, CallDescriptor::kPatchableCallSite);
|
| @@ -289,8 +288,7 @@ void JSGenericLowering::LowerJSLoadNamed(Node* node) {
|
| CodeFactory::LoadICInOptimizedCode(isolate(), p.contextual_mode());
|
| PatchInsertInput(node, 1, jsgraph()->HeapConstant(p.name()));
|
| if (FLAG_vector_ics) {
|
| - PatchInsertInput(node, 2,
|
| - jsgraph()->SmiConstant(p.feedback().slot().ToInt()));
|
| + PatchInsertInput(node, 2, jsgraph()->SmiConstant(p.feedback().index()));
|
| PatchInsertInput(node, 3, jsgraph()->HeapConstant(p.feedback().vector()));
|
| }
|
| ReplaceWithStubCall(node, callable, CallDescriptor::kPatchableCallSite);
|
|
|