[vm] Remove some bin -> vm includes.

Change-Id: Id304de9618a299a201b946a901a54352772f56fb Reviewed-on: https://dart-review.googlesource.com/48704 Reviewed-by: Siva Annamalai <[email protected]> Reviewed-by: Zach Anderson <[email protected]> Commit-Queue: Ryan Macnak <[email protected]>
flutter · Mar 28, 2018 · d9c3190 · d9c3190
1 parent 3dcdaf9
commit d9c3190
Show file tree

Hide file tree

Showing 25 changed files with 50 additions and 56 deletions.
diff --git a/runtime/bin/builtin.cc b/runtime/bin/builtin.cc
@@ -10,10 +10,6 @@
 #include "bin/dartutils.h"
 #include "bin/platform.h"
 
-#include "vm/dart_api_impl.h"
-#include "vm/object.h"
-#include "vm/object_store.h"
-
 namespace dart {
 namespace bin {
 

diff --git a/runtime/bin/directory_test.cc b/runtime/bin/directory_test.cc
@@ -5,8 +5,6 @@
 #include "bin/directory.h"
 #include "include/dart_api.h"
 #include "platform/assert.h"
-#include "vm/isolate.h"
-#include "vm/thread.h"
 #include "vm/unit_test.h"
 
 namespace dart {

diff --git a/runtime/bin/reference_counting.h b/runtime/bin/reference_counting.h
@@ -5,7 +5,7 @@
 #ifndef RUNTIME_BIN_REFERENCE_COUNTING_H_
 #define RUNTIME_BIN_REFERENCE_COUNTING_H_
 
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 
 namespace dart {
 namespace bin {

diff --git a/runtime/vm/atomic.h → runtime/platform/atomic.h b/runtime/vm/atomic.h → runtime/platform/atomic.h
@@ -2,12 +2,12 @@
 // 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.
 
-#ifndef RUNTIME_VM_ATOMIC_H_
-#define RUNTIME_VM_ATOMIC_H_
+#ifndef RUNTIME_PLATFORM_ATOMIC_H_
+#define RUNTIME_PLATFORM_ATOMIC_H_
 
 #include "platform/globals.h"
 
-#include "vm/allocation.h"
+#include "platform/allocation.h"
 
 namespace dart {
 
@@ -55,17 +55,17 @@ class AtomicOperations : public AllStatic {
 }  // namespace dart
 
 #if defined(HOST_OS_ANDROID)
-#include "vm/atomic_android.h"
+#include "platform/atomic_android.h"
 #elif defined(HOST_OS_FUCHSIA)
-#include "vm/atomic_fuchsia.h"
+#include "platform/atomic_fuchsia.h"
 #elif defined(HOST_OS_LINUX)
-#include "vm/atomic_linux.h"
+#include "platform/atomic_linux.h"
 #elif defined(HOST_OS_MACOS)
-#include "vm/atomic_macos.h"
+#include "platform/atomic_macos.h"
 #elif defined(HOST_OS_WINDOWS)
-#include "vm/atomic_win.h"
+#include "platform/atomic_win.h"
 #else
 #error Unknown target os.
 #endif
 
-#endif  // RUNTIME_VM_ATOMIC_H_
+#endif  // RUNTIME_PLATFORM_ATOMIC_H_
diff --git a/runtime/vm/atomic_android.h → runtime/platform/atomic_android.h b/runtime/vm/atomic_android.h → runtime/platform/atomic_android.h
@@ -2,10 +2,10 @@
 // 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.
 
-#ifndef RUNTIME_VM_ATOMIC_ANDROID_H_
-#define RUNTIME_VM_ATOMIC_ANDROID_H_
+#ifndef RUNTIME_PLATFORM_ATOMIC_ANDROID_H_
+#define RUNTIME_PLATFORM_ATOMIC_ANDROID_H_
 
-#if !defined RUNTIME_VM_ATOMIC_H_
+#if !defined RUNTIME_PLATFORM_ATOMIC_H_
 #error Do not include atomic_android.h directly. Use atomic.h instead.
 #endif
 
@@ -57,4 +57,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // RUNTIME_VM_ATOMIC_ANDROID_H_
+#endif  // RUNTIME_PLATFORM_ATOMIC_ANDROID_H_
diff --git a/runtime/vm/atomic_fuchsia.h → runtime/platform/atomic_fuchsia.h b/runtime/vm/atomic_fuchsia.h → runtime/platform/atomic_fuchsia.h
@@ -2,10 +2,10 @@
 // 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.
 
-#ifndef RUNTIME_VM_ATOMIC_FUCHSIA_H_
-#define RUNTIME_VM_ATOMIC_FUCHSIA_H_
+#ifndef RUNTIME_PLATFORM_ATOMIC_FUCHSIA_H_
+#define RUNTIME_PLATFORM_ATOMIC_FUCHSIA_H_
 
-#if !defined RUNTIME_VM_ATOMIC_H_
+#if !defined RUNTIME_PLATFORM_ATOMIC_H_
 #error Do not include atomic_fuchsia.h directly. Use atomic.h instead.
 #endif
 
@@ -57,4 +57,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // RUNTIME_VM_ATOMIC_FUCHSIA_H_
+#endif  // RUNTIME_PLATFORM_ATOMIC_FUCHSIA_H_
diff --git a/runtime/vm/atomic_linux.h → runtime/platform/atomic_linux.h b/runtime/vm/atomic_linux.h → runtime/platform/atomic_linux.h
@@ -2,10 +2,10 @@
 // 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.
 
-#ifndef RUNTIME_VM_ATOMIC_LINUX_H_
-#define RUNTIME_VM_ATOMIC_LINUX_H_
+#ifndef RUNTIME_PLATFORM_ATOMIC_LINUX_H_
+#define RUNTIME_PLATFORM_ATOMIC_LINUX_H_
 
-#if !defined RUNTIME_VM_ATOMIC_H_
+#if !defined RUNTIME_PLATFORM_ATOMIC_H_
 #error Do not include atomic_linux.h directly. Use atomic.h instead.
 #endif
 
@@ -57,4 +57,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // RUNTIME_VM_ATOMIC_LINUX_H_
+#endif  // RUNTIME_PLATFORM_ATOMIC_LINUX_H_
diff --git a/runtime/vm/atomic_macos.h → runtime/platform/atomic_macos.h b/runtime/vm/atomic_macos.h → runtime/platform/atomic_macos.h
@@ -2,10 +2,10 @@
 // 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.
 
-#ifndef RUNTIME_VM_ATOMIC_MACOS_H_
-#define RUNTIME_VM_ATOMIC_MACOS_H_
+#ifndef RUNTIME_PLATFORM_ATOMIC_MACOS_H_
+#define RUNTIME_PLATFORM_ATOMIC_MACOS_H_
 
-#if !defined RUNTIME_VM_ATOMIC_H_
+#if !defined RUNTIME_PLATFORM_ATOMIC_H_
 #error Do not include atomic_macos.h directly. Use atomic.h instead.
 #endif
 
@@ -57,4 +57,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // RUNTIME_VM_ATOMIC_MACOS_H_
+#endif  // RUNTIME_PLATFORM_ATOMIC_MACOS_H_
diff --git a/runtime/vm/atomic_win.h → runtime/platform/atomic_win.h b/runtime/vm/atomic_win.h → runtime/platform/atomic_win.h
@@ -2,10 +2,10 @@
 // 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.
 
-#ifndef RUNTIME_VM_ATOMIC_WIN_H_
-#define RUNTIME_VM_ATOMIC_WIN_H_
+#ifndef RUNTIME_PLATFORM_ATOMIC_WIN_H_
+#define RUNTIME_PLATFORM_ATOMIC_WIN_H_
 
-#if !defined RUNTIME_VM_ATOMIC_H_
+#if !defined RUNTIME_PLATFORM_ATOMIC_H_
 #error Do not include atomic_win.h directly. Use atomic.h instead.
 #endif
 
@@ -131,4 +131,4 @@ inline uint32_t AtomicOperations::CompareAndSwapUint32(uint32_t* ptr,
 
 }  // namespace dart
 
-#endif  // RUNTIME_VM_ATOMIC_WIN_H_
+#endif  // RUNTIME_PLATFORM_ATOMIC_WIN_H_
diff --git a/runtime/platform/platform_sources.gni b/runtime/platform/platform_sources.gni
@@ -9,6 +9,12 @@ platform_sources = [
   "allocation.h",
   "assert.cc",
   "assert.h",
+  "atomic.h",
+  "atomic_android.h",
+  "atomic_fuchsia.h",
+  "atomic_linux.h",
+  "atomic_macos.h",
+  "atomic_win.h",
   "c99_support_win.h",
   "floating_point.h",
   "floating_point_win.cc",

diff --git a/runtime/vm/atomic_test.cc b/runtime/vm/atomic_test.cc
@@ -2,7 +2,7 @@
 // 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 "vm/atomic.h"
+#include "platform/atomic.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/globals.h"

diff --git a/runtime/vm/class_table.cc b/runtime/vm/class_table.cc
@@ -4,7 +4,7 @@
 
 #include "vm/class_table.h"
 
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 #include "vm/flags.h"
 #include "vm/freelist.h"
 #include "vm/growable_array.h"

diff --git a/runtime/vm/class_table.h b/runtime/vm/class_table.h
@@ -6,7 +6,7 @@
 #define RUNTIME_VM_CLASS_TABLE_H_
 
 #include "platform/assert.h"
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 #include "vm/bitfield.h"
 #include "vm/globals.h"
 

diff --git a/runtime/vm/compiler_stats.h b/runtime/vm/compiler_stats.h
@@ -5,8 +5,8 @@
 #ifndef RUNTIME_VM_COMPILER_STATS_H_
 #define RUNTIME_VM_COMPILER_STATS_H_
 
+#include "platform/atomic.h"
 #include "vm/allocation.h"
-#include "vm/atomic.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
 #include "vm/timer.h"

diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
@@ -7,8 +7,8 @@
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
+#include "platform/atomic.h"
 #include "platform/text_buffer.h"
-#include "vm/atomic.h"
 #include "vm/class_finalizer.h"
 #include "vm/code_observers.h"
 #include "vm/compiler/jit/compiler.h"

diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h
@@ -7,7 +7,7 @@
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 #include "vm/base_isolate.h"
 #include "vm/class_table.h"
 #include "vm/exceptions.h"

diff --git a/runtime/vm/os_thread.cc b/runtime/vm/os_thread.cc
@@ -4,7 +4,7 @@
 
 #include "vm/os_thread.h"
 
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 #include "vm/lockers.h"
 #include "vm/log.h"
 #include "vm/thread_interrupter.h"

diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc
@@ -6,8 +6,8 @@
 #include "platform/memory_sanitizer.h"
 #include "platform/utils.h"
 
+#include "platform/atomic.h"
 #include "vm/allocation.h"
-#include "vm/atomic.h"
 #include "vm/code_patcher.h"
 #include "vm/debugger.h"
 #include "vm/instructions.h"

diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h
@@ -6,7 +6,7 @@
 #define RUNTIME_VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 #include "vm/exceptions.h"
 #include "vm/globals.h"
 #include "vm/snapshot.h"

diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
@@ -7,8 +7,8 @@
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
+#include "platform/atomic.h"
 #include "platform/safe_stack.h"
-#include "vm/atomic.h"
 #include "vm/bitfield.h"
 #include "vm/globals.h"
 #include "vm/handles.h"

diff --git a/runtime/vm/timeline.cc b/runtime/vm/timeline.cc
@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <cstdlib>
 
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
 #include "vm/lockers.h"

diff --git a/runtime/vm/timeline_android.cc b/runtime/vm/timeline_android.cc
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <cstdlib>
 
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
 #include "vm/lockers.h"

diff --git a/runtime/vm/timeline_linux.cc b/runtime/vm/timeline_linux.cc
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <cstdlib>
 
-#include "vm/atomic.h"
+#include "platform/atomic.h"
 #include "vm/isolate.h"
 #include "vm/json_stream.h"
 #include "vm/lockers.h"

diff --git a/runtime/vm/timer.h b/runtime/vm/timer.h
@@ -5,9 +5,9 @@
 #ifndef RUNTIME_VM_TIMER_H_
 #define RUNTIME_VM_TIMER_H_
 
+#include "platform/atomic.h"
 #include "platform/utils.h"
 #include "vm/allocation.h"
-#include "vm/atomic.h"
 #include "vm/flags.h"
 #include "vm/os.h"
 

diff --git a/runtime/vm/vm_sources.gni b/runtime/vm/vm_sources.gni
@@ -13,12 +13,6 @@ vm_sources = [
   "ast_printer.h",
   "ast_transformer.cc",
   "ast_transformer.h",
-  "atomic.h",
-  "atomic_android.h",
-  "atomic_fuchsia.h",
-  "atomic_linux.h",
-  "atomic_macos.h",
-  "atomic_win.h",
   "base_isolate.h",
   "become.cc",
   "become.h",