commit f5ef541b3ae782d99687cc3354c5d4094abb261c
author Mathieu Chartier <mathieuc@google.com> Tue Jan 12 21:47:56 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 12 21:47:56 2016 +0000
tree f8a290cd9ec3c42e17bc4e8553fb54c4df60356b
parent 37fad75f7482464e08dde5219eb74270346b1709
parent 7ca9557b14dd3aee4ec18700f0c6282eded5dd76

Merge "Revert "Disable flaky test on host.""

runtime/interpreter/interpreter.cc

diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc
index 47e2e98..6b5218d 100644
--- a/runtime/interpreter/interpreter.cc
+++ b/runtime/interpreter/interpreter.cc
@@ -294,7 +294,7 @@
         const instrumentation::Instrumentation* const instrumentation =
             Runtime::Current()->GetInstrumentation();
         while (true) {
-          if (instrumentation->IsActive()) {
+          if (instrumentation->IsActive() || !Runtime::Current()->IsStarted()) {
             // TODO: allow JIT profiling instrumentation.  Now, just punt on all instrumentation.
 #if !defined(__clang__)
             return ExecuteGotoImpl<false, false>(self, code_item, shadow_frame, result_register);