Index: test/cctest/compiler/test-codegen-deopt.cc |
diff --git a/test/cctest/compiler/test-codegen-deopt.cc b/test/cctest/compiler/test-codegen-deopt.cc |
index 9c12cb2dbde299dfb304a135d9cfacec2cd987f3..0b5930821654b5fc064c376b2499e550a43098b4 100644 |
--- a/test/cctest/compiler/test-codegen-deopt.cc |
+++ b/test/cctest/compiler/test-codegen-deopt.cc |
@@ -46,7 +46,9 @@ class DeoptCodegenTester { |
function(NewFunction(src)), |
parse_info(scope->main_zone(), function), |
info(&parse_info), |
- bailout_id(-1) { |
+ bailout_id(-1), |
+ tagged_type(1, kMachAnyTagged, zone()), |
+ empty_types(zone()) { |
CHECK(Parser::ParseStatic(&parse_info)); |
info.SetOptimizing(BailoutId::None(), Handle<Code>(function->code())); |
CHECK(Compiler::Analyze(&parse_info)); |
@@ -83,6 +85,8 @@ class DeoptCodegenTester { |
Handle<Code> result_code; |
TestInstrSeq* code; |
Graph* graph; |
+ ZoneVector<MachineType> tagged_type; |
+ ZoneVector<MachineType> empty_types; |
}; |
@@ -120,9 +124,10 @@ class TrivialDeoptCodegenTester : public DeoptCodegenTester { |
m.NewNode(common.HeapConstant(caller_context_constant)); |
bailout_id = GetCallBailoutId(); |
- Node* parameters = m.NewNode(common.StateValues(1), m.UndefinedConstant()); |
- Node* locals = m.NewNode(common.StateValues(0)); |
- Node* stack = m.NewNode(common.StateValues(0)); |
+ Node* parameters = |
+ m.NewNode(common.TypedStateValues(&tagged_type), m.UndefinedConstant()); |
+ Node* locals = m.NewNode(common.TypedStateValues(&empty_types)); |
+ Node* stack = m.NewNode(common.TypedStateValues(&empty_types)); |
Node* state_node = m.NewNode( |
common.FrameState(JS_FRAME, bailout_id, |
@@ -235,9 +240,10 @@ class TrivialRuntimeDeoptCodegenTester : public DeoptCodegenTester { |
Node* context_node = m.NewNode(common.HeapConstant(context_constant)); |
bailout_id = GetCallBailoutId(); |
- Node* parameters = m.NewNode(common.StateValues(1), m.UndefinedConstant()); |
- Node* locals = m.NewNode(common.StateValues(0)); |
- Node* stack = m.NewNode(common.StateValues(0)); |
+ Node* parameters = |
+ m.NewNode(common.TypedStateValues(&tagged_type), m.UndefinedConstant()); |
+ Node* locals = m.NewNode(common.TypedStateValues(&empty_types)); |
+ Node* stack = m.NewNode(common.TypedStateValues(&empty_types)); |
Node* state_node = m.NewNode( |
common.FrameState(JS_FRAME, bailout_id, |