Chromium Code Reviews| Index: src/compiler/js-generic-lowering.cc |
| diff --git a/src/compiler/js-generic-lowering.cc b/src/compiler/js-generic-lowering.cc |
| index 69526cd7eae8d43227c820e3842c05c01c7377e2..e23c355bcf20faae710c0de944110be2d109af6f 100644 |
| --- a/src/compiler/js-generic-lowering.cc |
| +++ b/src/compiler/js-generic-lowering.cc |
| @@ -156,11 +156,11 @@ void JSGenericLowering::LowerJSLoadProperty(Node* node) { |
| Callable callable = CodeFactory::KeyedLoadICInOptimizedCode(isolate()); |
| // Load the type feedback vector from the closure. |
| Node* literals = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), closure, |
| + machine()->Load(MachineType::TaggedPointer()), closure, |
| jsgraph()->IntPtrConstant(JSFunction::kLiteralsOffset - kHeapObjectTag), |
| effect, control); |
| Node* vector = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), literals, |
| + machine()->Load(MachineType::TaggedPointer()), literals, |
| jsgraph()->IntPtrConstant(LiteralsArray::kFeedbackVectorOffset - |
| kHeapObjectTag), |
| effect, control); |
| @@ -180,11 +180,11 @@ void JSGenericLowering::LowerJSLoadNamed(Node* node) { |
| Callable callable = CodeFactory::LoadICInOptimizedCode(isolate()); |
| // Load the type feedback vector from the closure. |
| Node* literals = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), closure, |
| + machine()->Load(MachineType::TaggedPointer()), closure, |
| jsgraph()->IntPtrConstant(JSFunction::kLiteralsOffset - kHeapObjectTag), |
| effect, control); |
| Node* vector = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), literals, |
| + machine()->Load(MachineType::TaggedPointer()), literals, |
| jsgraph()->IntPtrConstant(LiteralsArray::kFeedbackVectorOffset - |
| kHeapObjectTag), |
| effect, control); |
| @@ -206,11 +206,11 @@ void JSGenericLowering::LowerJSLoadGlobal(Node* node) { |
| CodeFactory::LoadGlobalICInOptimizedCode(isolate(), p.typeof_mode()); |
| // Load the type feedback vector from the closure. |
| Node* literals = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), closure, |
| + machine()->Load(MachineType::TaggedPointer()), closure, |
| jsgraph()->IntPtrConstant(JSFunction::kLiteralsOffset - kHeapObjectTag), |
| effect, control); |
| Node* vector = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), literals, |
| + machine()->Load(MachineType::TaggedPointer()), literals, |
| jsgraph()->IntPtrConstant(LiteralsArray::kFeedbackVectorOffset - |
| kHeapObjectTag), |
| effect, control); |
| @@ -235,11 +235,11 @@ void JSGenericLowering::LowerJSStoreProperty(Node* node) { |
| CodeFactory::KeyedStoreICInOptimizedCode(isolate(), language_mode); |
| // Load the type feedback vector from the closure. |
| Node* literals = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), closure, |
| + machine()->Load(MachineType::TaggedPointer()), closure, |
| jsgraph()->IntPtrConstant(JSFunction::kLiteralsOffset - kHeapObjectTag), |
| effect, control); |
| Node* vector = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), literals, |
| + machine()->Load(MachineType::TaggedPointer()), literals, |
| jsgraph()->IntPtrConstant(LiteralsArray::kFeedbackVectorOffset - |
| kHeapObjectTag), |
| effect, control); |
| @@ -268,11 +268,11 @@ void JSGenericLowering::LowerJSStoreNamed(Node* node) { |
| CodeFactory::StoreICInOptimizedCode(isolate(), p.language_mode()); |
| // Load the type feedback vector from the closure. |
| Node* literals = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), closure, |
| + machine()->Load(MachineType::TaggedPointer()), closure, |
| jsgraph()->IntPtrConstant(JSFunction::kLiteralsOffset - kHeapObjectTag), |
| effect, control); |
| Node* vector = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), literals, |
| + machine()->Load(MachineType::TaggedPointer()), literals, |
| jsgraph()->IntPtrConstant(LiteralsArray::kFeedbackVectorOffset - |
| kHeapObjectTag), |
| effect, control); |
| @@ -301,22 +301,22 @@ void JSGenericLowering::LowerJSStoreGlobal(Node* node) { |
| CodeFactory::StoreICInOptimizedCode(isolate(), p.language_mode()); |
| // Load the type feedback vector from the closure. |
| Node* literals = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), closure, |
| + machine()->Load(MachineType::TaggedPointer()), closure, |
| jsgraph()->IntPtrConstant(JSFunction::kLiteralsOffset - kHeapObjectTag), |
| effect, control); |
| Node* vector = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), literals, |
| + machine()->Load(MachineType::TaggedPointer()), literals, |
| jsgraph()->IntPtrConstant(LiteralsArray::kFeedbackVectorOffset - |
| kHeapObjectTag), |
| effect, control); |
| // Load global object from the context. |
| Node* native_context = effect = |
| - graph()->NewNode(machine()->Load(MachineType::AnyTagged()), context, |
| + graph()->NewNode(machine()->Load(MachineType::TaggedPointer()), context, |
| jsgraph()->IntPtrConstant( |
| Context::SlotOffset(Context::NATIVE_CONTEXT_INDEX)), |
| effect, control); |
| Node* global = effect = graph()->NewNode( |
| - machine()->Load(MachineType::AnyTagged()), native_context, |
| + machine()->Load(MachineType::TaggedPointer()), native_context, |
| jsgraph()->IntPtrConstant(Context::SlotOffset(Context::EXTENSION_INDEX)), |
| effect, control); |
| typedef StoreWithVectorDescriptor Descriptor; |
| @@ -351,7 +351,7 @@ void JSGenericLowering::LowerJSLoadContext(Node* node) { |
| const ContextAccess& access = ContextAccessOf(node->op()); |
| for (size_t i = 0; i < access.depth(); ++i) { |
| node->ReplaceInput( |
| - 0, graph()->NewNode(machine()->Load(MachineType::AnyTagged()), |
| + 0, graph()->NewNode(machine()->Load(MachineType::TaggedPointer()), |
| NodeProperties::GetValueInput(node, 0), |
| jsgraph()->Int32Constant( |
| Context::SlotOffset(Context::PREVIOUS_INDEX)), |
| @@ -361,7 +361,7 @@ void JSGenericLowering::LowerJSLoadContext(Node* node) { |
| node->ReplaceInput(1, jsgraph()->Int32Constant(Context::SlotOffset( |
| static_cast<int>(access.index())))); |
| node->AppendInput(zone(), graph()->start()); |
| - NodeProperties::ChangeOp(node, machine()->Load(MachineType::AnyTagged())); |
| + NodeProperties::ChangeOp(node, machine()->Load(MachineType::TaggedPointer())); |
|
Michael Starzinger
2016/08/22 12:59:46
This is the load of the actual context slot (not t
mvstanton
2016/08/24 16:06:28
Done.
|
| } |
| @@ -369,7 +369,7 @@ void JSGenericLowering::LowerJSStoreContext(Node* node) { |
| const ContextAccess& access = ContextAccessOf(node->op()); |
| for (size_t i = 0; i < access.depth(); ++i) { |
| node->ReplaceInput( |
| - 0, graph()->NewNode(machine()->Load(MachineType::AnyTagged()), |
| + 0, graph()->NewNode(machine()->Load(MachineType::TaggedPointer()), |
| NodeProperties::GetValueInput(node, 0), |
| jsgraph()->Int32Constant( |
| Context::SlotOffset(Context::PREVIOUS_INDEX)), |
| @@ -600,7 +600,7 @@ void JSGenericLowering::LowerJSLoadMessage(Node* node) { |
| node->RemoveInput(NodeProperties::FirstContextIndex(node)); |
| node->InsertInput(zone(), 0, jsgraph()->ExternalConstant(message_address)); |
| node->InsertInput(zone(), 1, jsgraph()->IntPtrConstant(0)); |
| - NodeProperties::ChangeOp(node, machine()->Load(MachineType::AnyTagged())); |
| + NodeProperties::ChangeOp(node, machine()->Load(MachineType::TaggedPointer())); |
|
Michael Starzinger
2016/08/22 12:59:46
nit: The ThreadLocalTop::pending_message_obj_ is o
mvstanton
2016/08/24 16:06:28
Done.
|
| } |