[vm] Move some VM defines out of platform.

TEST=build
Bug: #32364
Change-Id: Icf0d8f69235ec0369cbe135f833a522a1269319f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433962
Reviewed-by: Siva Annamalai <[email protected]>
Commit-Queue: Ryan Macnak <[email protected]>

Author: rmacnak-google

runtime/platform/globals.h

@@ -731,24 +731,6 @@ DART_FORCE_INLINE D bit_copy(const S& source) {
 // Undefine math.h definition which clashes with our condition names.
 #undef OVERFLOW
 
-// Include IL printer and disassembler functionality into non-PRODUCT builds,
-// in all AOT compiler builds or when forced.
-#if !defined(PRODUCT) || defined(DART_PRECOMPILER) ||                          \
-    defined(FORCE_INCLUDE_DISASSEMBLER)
-#if defined(DART_PRECOMPILED_RUNTIME) && defined(PRODUCT)
-#error Requested to include IL printer into PRODUCT AOT runtime
-#endif
-#define INCLUDE_IL_PRINTER 1
-#if !defined(FORCE_INCLUDE_DISASSEMBLER)
-#define FORCE_INCLUDE_DISASSEMBLER 1
-#endif
-#endif
-
-// Include HeapSnapshotWriter functionality if not in PRODUCT.
-#if !defined(DART_ENABLE_HEAP_SNAPSHOT_WRITER) && !defined(PRODUCT)
-#define DART_ENABLE_HEAP_SNAPSHOT_WRITER 1
-#endif
-
 #if defined(DART_HOST_OS_ANDROID)
 #define kHostOperatingSystemName "android"
 #elif defined(DART_HOST_OS_FUCHSIA)

runtime/vm/compiler/api/print_filter.cc

@@ -1,7 +1,7 @@
 // Copyright (c) 2020, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-#include "platform/globals.h"  // For INCLUDE_IL_PRINTER
+#include "vm/globals.h"  // For INCLUDE_IL_PRINTER
 #if defined(INCLUDE_IL_PRINTER)
 
 #include "vm/compiler/api/print_filter.h"

runtime/vm/compiler/api/print_filter.h

@@ -5,7 +5,7 @@
 #ifndef RUNTIME_VM_COMPILER_API_PRINT_FILTER_H_
 #define RUNTIME_VM_COMPILER_API_PRINT_FILTER_H_
 
-#include "platform/globals.h"  // For INCLUDE_IL_PRINTER
+#include "vm/globals.h"  // For INCLUDE_IL_PRINTER
 
 #if defined(INCLUDE_IL_PRINTER)
 

runtime/vm/compiler/backend/il_printer.cc

@@ -12,6 +12,7 @@
 #include "vm/compiler/backend/linearscan.h"
 #include "vm/compiler/backend/range_analysis.h"
 #include "vm/compiler/ffi/native_calling_convention.h"
+#include "vm/globals.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 

runtime/vm/flag_list.h

@@ -6,6 +6,7 @@
 #define RUNTIME_VM_FLAG_LIST_H_
 
 #include "platform/thread_sanitizer.h"
+#include "vm/globals.h"
 
 // Don't use USING_PRODUCT outside of this file.
 #if defined(PRODUCT)

runtime/vm/globals.h

@@ -112,6 +112,24 @@ const intptr_t kDefaultNewGenSemiMaxSize = (kWordSize <= 4) ? 8 : 16;
 #define SUPPORT_TIMELINE 1
 #endif
 
+// Include IL printer and disassembler functionality into non-PRODUCT builds,
+// in all AOT compiler builds or when forced.
+#if !defined(PRODUCT) || defined(DART_PRECOMPILER) ||                          \
+    defined(FORCE_INCLUDE_DISASSEMBLER)
+#if defined(DART_PRECOMPILED_RUNTIME) && defined(PRODUCT)
+#error Requested to include IL printer into PRODUCT AOT runtime
+#endif
+#define INCLUDE_IL_PRINTER 1
+#if !defined(FORCE_INCLUDE_DISASSEMBLER)
+#define FORCE_INCLUDE_DISASSEMBLER 1
+#endif
+#endif
+
+// Include HeapSnapshotWriter functionality if not in PRODUCT.
+#if !defined(DART_ENABLE_HEAP_SNAPSHOT_WRITER) && !defined(PRODUCT)
+#define DART_ENABLE_HEAP_SNAPSHOT_WRITER 1
+#endif
+
 #if defined(ARCH_IS_64_BIT) && !defined(IS_SIMARM_HOST64)
 #define HASH_IN_OBJECT_HEADER 1
 #endif