From cdff6fa306ea014094943fbd5f58a263084a3155 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@gmail.com>
Date: Tue, 30 Aug 2016 16:25:51 -0700
Subject: [PATCH] =?UTF-8?q?Respect=20the=20=E2=80=94enable-checked-mode=20?=
 =?UTF-8?q?flag=20when=20not=20running=20precompiled=20code=20instead=20of?=
 =?UTF-8?q?=20defaulting=20it=20on.=20(#2986)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/dart_init.cc | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/runtime/dart_init.cc b/runtime/dart_init.cc
index 0ebe20564cf..a71945a2ce2 100644
--- a/runtime/dart_init.cc
+++ b/runtime/dart_init.cc
@@ -523,17 +523,10 @@ void SetRegisterNativeServiceProtocolExtensionHook(
 }
 
 static bool ShouldEnableCheckedMode() {
-  if (IsRunningPrecompiledCode()) {
-    // Checked mode is never enabled during precompilation. Even snapshot
-    // generation disables checked mode arguments.
-    return false;
-  }
-
-#if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
-  return true;
-#else
-  return Settings::Get().enable_dart_checked_mode;
-#endif
+  // Checked mode is never enabled during precompilation. Even snapshot
+  // generation disables checked mode arguments.
+  return IsRunningPrecompiledCode() ? false
+                                    : Settings::Get().enable_dart_checked_mode;
 }
 
 void PushBackAll(std::vector<const char*>* args,