[SDK] Fixes FORCE_INCLUDE_DISASSEMBLER build in PRODUCT.

Clement Skau · commit-bot@chromium.org · commit 369fdb7cb227 · 2019-11-18T14:38:03.000Z
CodeObservers is not available in PRODUCT, but FORCE_INCLUDE_DISASSEMBLER will enable code that uses (but doesn't strictly need) it. This is related to https://dart-review.googlesource.com/c/sdk/+/125404. Tested: ./tools/build.py --arch x64 --mode product dart_precompiled_runtime gen_snapshot Change-Id: I5f0c0765a608b50704045c918b41c71398b89390 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125263 Reviewed-by: Martin Kustermann <kustermann@google.com> Commit-Queue: Clement Skau <cskau@google.com>
diff --git a/runtime/vm/clustered_snapshot.cc b/runtime/vm/clustered_snapshot.cc
@@ -1575,12 +1575,14 @@ class CodeDeserializationCluster : public DeserializationCluster {
 
 #if !defined(PRODUCT) || defined(FORCE_INCLUDE_DISASSEMBLER)
   void PostLoad(const Array& refs, Snapshot::Kind kind, Zone* zone) {
+#if !defined(PRODUCT)
     if (!CodeObservers::AreActive() && !FLAG_support_disassembler) return;
+#endif
     Code& code = Code::Handle(zone);
     Object& owner = Object::Handle(zone);
     for (intptr_t id = start_index_; id < stop_index_; id++) {
       code ^= refs.At(id);
-#if !defined(DART_PRECOMPILED_RUNTIME)
+#if !defined(DART_PRECOMPILED_RUNTIME) && !defined(PRODUCT)
       if (CodeObservers::AreActive()) {
         Code::NotifyCodeObservers(code, code.is_optimized());
       }
