Chromium Code Reviews| Index: runtime/vm/flow_graph_compiler.cc |
| diff --git a/runtime/vm/flow_graph_compiler.cc b/runtime/vm/flow_graph_compiler.cc |
| index 7a411c9877d31782b26ca037d834528e6c8a2709..1e58d955e92c450e40debdcdfa2384276f0887e9 100644 |
| --- a/runtime/vm/flow_graph_compiler.cc |
| +++ b/runtime/vm/flow_graph_compiler.cc |
| @@ -17,6 +17,7 @@ |
| #include "vm/flow_graph_allocator.h" |
| #include "vm/il_printer.h" |
| #include "vm/intrinsifier.h" |
| +#include "vm/kernel_isolate.h" |
| #include "vm/locations.h" |
| #include "vm/log.h" |
| #include "vm/longjump.h" |
| @@ -301,7 +302,17 @@ bool FlowGraphCompiler::ForceSlowPathForStackOverflow() const { |
| #if !defined(PRODUCT) |
| if ((FLAG_stacktrace_every > 0) || (FLAG_deoptimize_every > 0) || |
| (isolate()->reload_every_n_stack_overflow_checks() > 0)) { |
| - return true; |
| +#if defined(DART_PRECOMPILED_RUNTIME) |
|
kustermann
2017/08/23 11:22:15
Does someone know why the other FlowGraphCompiler
Vyacheslav Egorov (Google)
2017/08/23 18:41:25
I think it's just compiled and should be thrown by
kustermann
2017/08/24 09:15:02
Makes sense.
|
| + const bool is_kernel_isolate = false; |
| +#else |
| + // Certain flags should not effect the kernel isolate itself. They might be |
| + // used by tests via the "VMOptions=--..." annotation to test VM |
| + // functionality in the main isolate. |
| + const bool is_kernel_isolate = KernelIsolate::IsKernelIsolate(isolate()); |
|
Vyacheslav Egorov (Google)
2017/08/23 18:41:25
What about VMService isolate?
kustermann
2017/08/24 09:15:02
done
|
| +#endif // !defined(DART_PRECOMPILED_RUNTIME) |
| + if (!is_kernel_isolate) { |
| + return true; |
| + } |
| } |
| if (FLAG_stacktrace_filter != NULL && |
| strstr(parsed_function().function().ToFullyQualifiedCString(), |