| Index: runtime/vm/flow_graph_compiler.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_compiler.cc (revision 9119)
|
| +++ runtime/vm/flow_graph_compiler.cc (working copy)
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "vm/flow_graph_compiler.h"
|
|
|
| +#include "vm/dart_entry.h"
|
| #include "vm/debugger.h"
|
| #include "vm/il_printer.h"
|
| #include "vm/intrinsifier.h"
|
| @@ -80,6 +81,13 @@
|
| }
|
|
|
|
|
| +bool FlowGraphCompiler::CanOptimize() {
|
| + return !FLAG_report_usage_count &&
|
| + (FLAG_optimization_counter_threshold >= 0) &&
|
| + !Isolate::Current()->debugger()->IsActive();
|
| +}
|
| +
|
| +
|
| void FlowGraphCompiler::VisitBlocks() {
|
| for (intptr_t i = 0; i < block_order().length(); ++i) {
|
| ASSERT(frame_register_allocator()->IsSpilled());
|
| @@ -231,13 +239,6 @@
|
| }
|
|
|
|
|
| -static bool CanOptimize() {
|
| - return !FLAG_report_usage_count &&
|
| - (FLAG_optimization_counter_threshold >= 0) &&
|
| - !Isolate::Current()->debugger()->IsActive();
|
| -}
|
| -
|
| -
|
| // Returns 'true' if code generation for this function is complete, i.e.,
|
| // no fall-through to regular code is needed.
|
| bool FlowGraphCompiler::TryIntrinsify() {
|
| @@ -295,7 +296,7 @@
|
| cid,
|
| checked_argument_count));
|
| const Array& arguments_descriptor =
|
| - CodeGenerator::ArgumentsDescriptor(argument_count, argument_names);
|
| + DartEntry::ArgumentsDescriptor(argument_count, argument_names);
|
| uword label_address = 0;
|
| switch (checked_argument_count) {
|
| case 1:
|
| @@ -330,7 +331,7 @@
|
| ASSERT(frame_register_allocator()->IsSpilled());
|
|
|
| const Array& arguments_descriptor =
|
| - CodeGenerator::ArgumentsDescriptor(argument_count, argument_names);
|
| + DartEntry::ArgumentsDescriptor(argument_count, argument_names);
|
| const intptr_t descr_offset = EmitStaticCall(function,
|
| arguments_descriptor,
|
| argument_count);
|
|
|