| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #include "vm/compiler.h" | 5 #include "vm/compiler.h" |
| 6 | 6 |
| 7 #include "vm/assembler.h" | 7 #include "vm/assembler.h" |
| 8 | 8 |
| 9 #include "vm/ast_printer.h" | 9 #include "vm/ast_printer.h" |
| 10 #include "vm/block_scheduler.h" | 10 #include "vm/block_scheduler.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 // Variables are allocated after compilation. | 124 // Variables are allocated after compilation. |
| 125 } | 125 } |
| 126 | 126 |
| 127 virtual FlowGraph* BuildFlowGraph( | 127 virtual FlowGraph* BuildFlowGraph( |
| 128 Zone* zone, | 128 Zone* zone, |
| 129 ParsedFunction* parsed_function, | 129 ParsedFunction* parsed_function, |
| 130 const ZoneGrowableArray<const ICData*>& ic_data_array, | 130 const ZoneGrowableArray<const ICData*>& ic_data_array, |
| 131 intptr_t osr_id) { | 131 intptr_t osr_id) { |
| 132 // Compile to the dart IR. | 132 // Compile to the dart IR. |
| 133 RegExpEngine::CompilationResult result = | 133 RegExpEngine::CompilationResult result = |
| 134 RegExpEngine::Compile(parsed_function->regexp_compile_data(), | 134 RegExpEngine::CompileIR(parsed_function->regexp_compile_data(), |
| 135 parsed_function, | 135 parsed_function, |
| 136 ic_data_array); | 136 ic_data_array); |
| 137 backtrack_goto_ = result.backtrack_goto; | 137 backtrack_goto_ = result.backtrack_goto; |
| 138 | 138 |
| 139 // Allocate variables now that we know the number of locals. | 139 // Allocate variables now that we know the number of locals. |
| 140 parsed_function->AllocateIrregexpVariables(result.num_stack_locals); | 140 parsed_function->AllocateIrregexpVariables(result.num_stack_locals); |
| 141 | 141 |
| 142 // Build the flow graph. | 142 // Build the flow graph. |
| 143 FlowGraphBuilder builder(*parsed_function, | 143 FlowGraphBuilder builder(*parsed_function, |
| 144 ic_data_array, | 144 ic_data_array, |
| 145 NULL, // NULL = not inlining. | 145 NULL, // NULL = not inlining. |
| 146 osr_id); | 146 osr_id); |
| (...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1334 const Object& result = | 1334 const Object& result = |
| 1335 PassiveObject::Handle(isolate->object_store()->sticky_error()); | 1335 PassiveObject::Handle(isolate->object_store()->sticky_error()); |
| 1336 isolate->object_store()->clear_sticky_error(); | 1336 isolate->object_store()->clear_sticky_error(); |
| 1337 return result.raw(); | 1337 return result.raw(); |
| 1338 } | 1338 } |
| 1339 UNREACHABLE(); | 1339 UNREACHABLE(); |
| 1340 return Object::null(); | 1340 return Object::null(); |
| 1341 } | 1341 } |
| 1342 | 1342 |
| 1343 } // namespace dart | 1343 } // namespace dart |
| OLD | NEW |