| Index: runtime/vm/code_generator_ia32.cc | 
| =================================================================== | 
| --- runtime/vm/code_generator_ia32.cc	(revision 2184) | 
| +++ runtime/vm/code_generator_ia32.cc	(working copy) | 
| @@ -11,6 +11,7 @@ | 
| #include "vm/ast_printer.h" | 
| #include "vm/class_finalizer.h" | 
| #include "vm/dart_entry.h" | 
| +#include "vm/debugger.h" | 
| #include "vm/ic_data.h" | 
| #include "vm/longjump.h" | 
| #include "vm/object.h" | 
| @@ -29,7 +30,6 @@ | 
| DECLARE_FLAG(bool, enable_type_checks); | 
| DECLARE_FLAG(bool, report_invocation_count); | 
| DECLARE_FLAG(bool, trace_compiler); | 
| -DECLARE_FLAG(bool, debugger); | 
|  | 
| #define __ assembler_-> | 
|  | 
| @@ -283,7 +283,7 @@ | 
| const bool may_optimize = | 
| !FLAG_report_invocation_count && | 
| (FLAG_optimization_invocation_threshold >= 0) && | 
| -      !FLAG_debugger && | 
| +      !Isolate::Current()->debugger()->IsActive() && | 
| parsed_function_.function().is_optimizable(); | 
| // Count invocation and check. | 
| if (FLAG_report_invocation_count || may_optimize) { | 
|  |