From bf67f24098c7ce0f74245218b936a2350c4ad281 Mon Sep 17 00:00:00 2001 From: "sgjesse@google.com" Date: Mon, 16 Jan 2012 12:28:10 +0000 Subject: [PATCH] Move assert.h/assert.cc from runtime/vm to runtime/platform The purpose of this change is twofold: 1. Source in the bin directory can now use the same assertions as source in the vm directory. The ASSERT macro used by the code in runtime/bin was just defined to use assert from the standard C library. 2. Moving other implementation parts from runtime/vm to runtime/platform (e.g. classes Monitor and Mutex) for sharing between runtime/bin and runtime/vm will be easier as these implementations rely on these assertion macros. Created two gypi files for the platform directory. One for the headers and one for the source. The source one is only included when building the VM library and will be present in libdart.a when the dart executable is linked. All the code for asserts is still in the dart namespace. Also re-arranged the order of includes to be alphabetically in the files touched. R=ager@google.com, iposva@google.com BUG= TEST= Review URL: http://codereview.chromium.org//9189003 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@3335 260f80e4-7a28-3924-810f-c04153c831b5 --- runtime/bin/bin.gypi | 2 +- runtime/bin/builtin.h | 18 +----------------- runtime/bin/builtin_natives.cc | 9 +++++---- runtime/bin/dartutils.cc | 1 + runtime/bin/directory.cc | 5 +++-- runtime/bin/file_linux.cc | 5 +++-- runtime/bin/file_macos.cc | 5 +++-- runtime/bin/file_test.cc | 2 +- runtime/bin/file_win.cc | 5 +++-- runtime/bin/thread_pool_test.cc | 8 ++------ runtime/lib/array.cc | 5 ++--- runtime/lib/byte_buffer.cc | 7 +++---- runtime/lib/isolate.cc | 5 ++--- runtime/lib/regexp.cc | 5 ++--- runtime/lib/regexp_jsc.cc | 5 ++--- runtime/{vm => platform}/assert.cc | 5 +++-- runtime/{vm => platform}/assert.h | 10 +++++----- runtime/platform/platform_headers.gypi | 13 +++++++++++++ runtime/platform/platform_sources.gypi | 4 +--- runtime/vm/allocation.cc | 4 ++-- runtime/vm/allocation.h | 5 +++-- runtime/vm/allocation_test.cc | 4 ++-- runtime/vm/assembler.h | 4 ++-- runtime/vm/assembler_arm.h | 4 ++-- runtime/vm/assembler_ia32.h | 4 ++-- runtime/vm/assembler_x64.h | 4 ++-- runtime/vm/assert_test.cc | 4 ++-- runtime/vm/ast.h | 4 ++-- runtime/vm/ast_printer_test.cc | 4 ++-- runtime/vm/ast_test.cc | 4 ++-- runtime/vm/bigint_operations_test.cc | 4 ++-- runtime/vm/bitfield_test.cc | 5 +++-- runtime/vm/boolfield.h | 4 +++- runtime/vm/boolfield_test.cc | 4 ++-- runtime/vm/class_finalizer_test.cc | 4 ++-- runtime/vm/code_generator_ia32_test.cc | 7 +++---- runtime/vm/code_generator_x64_test.cc | 7 +++---- runtime/vm/code_index_table.h | 4 ++-- runtime/vm/code_index_table_test.cc | 7 +++---- runtime/vm/compiler_test.cc | 5 ++--- runtime/vm/constants_ia32.h | 4 ++-- runtime/vm/cpu_test.cc | 4 ++-- runtime/vm/dart_api_impl_test.cc | 5 ++--- runtime/vm/dart_entry_test.cc | 4 ++-- runtime/vm/debugger_api_impl_test.cc | 5 ++--- runtime/vm/debuginfo.h | 4 ++-- runtime/vm/disassembler_arm.cc | 8 ++++---- runtime/vm/disassembler_ia32.cc | 6 +++--- runtime/vm/disassembler_x64.cc | 9 ++++----- runtime/vm/exceptions_test.cc | 5 ++--- runtime/vm/flags.cc | 4 ++-- runtime/vm/flags.h | 4 ++-- runtime/vm/flags_test.cc | 4 ++-- runtime/vm/freelist.h | 4 ++-- runtime/vm/freelist_test.cc | 4 ++-- runtime/vm/growable_array_test.cc | 4 ++-- runtime/vm/handles.cc | 4 ++-- runtime/vm/handles_test.cc | 4 ++-- runtime/vm/heap.cc | 4 ++-- runtime/vm/heap.h | 4 ++-- runtime/vm/heap_test.cc | 4 ++-- runtime/vm/isolate.cc | 5 ++--- runtime/vm/isolate.h | 4 ++-- runtime/vm/isolate_linux.cc | 7 ++++--- runtime/vm/isolate_macos.cc | 7 ++++--- runtime/vm/isolate_test.cc | 4 ++-- runtime/vm/isolate_win.cc | 7 ++++--- runtime/vm/isolate_win.h | 4 ++-- runtime/vm/memory_region.h | 5 +++-- runtime/vm/memory_region_test.cc | 4 ++-- runtime/vm/message_queue_test.cc | 4 ++-- runtime/vm/native_arguments.cc | 4 ++-- runtime/vm/native_arguments.h | 5 +++-- runtime/vm/object.cc | 4 ++-- runtime/vm/object.h | 4 ++-- runtime/vm/object_arm_test.cc | 4 ++-- runtime/vm/object_ia32_test.cc | 4 ++-- runtime/vm/object_test.cc | 4 ++-- runtime/vm/object_x64_test.cc | 4 ++-- runtime/vm/os_linux.cc | 5 +++-- runtime/vm/os_macos.cc | 5 +++-- runtime/vm/os_test.cc | 4 ++-- runtime/vm/os_win.cc | 7 ++++--- runtime/vm/pages.cc | 4 ++-- runtime/vm/pages_test.cc | 4 ++-- runtime/vm/port_test.cc | 4 ++-- runtime/vm/random.cc | 4 ++-- runtime/vm/random_test.cc | 4 ++-- runtime/vm/raw_object.h | 4 ++-- runtime/vm/resolver_test.cc | 4 ++-- runtime/vm/scanner.cc | 4 ++-- runtime/vm/scanner_test.cc | 4 ++-- runtime/vm/scavenger.h | 4 ++-- runtime/vm/scopes_test.cc | 4 ++-- runtime/vm/snapshot.cc | 4 ++-- runtime/vm/snapshot.h | 4 ++-- runtime/vm/snapshot_test.cc | 7 +++---- runtime/vm/stack_frame_test.cc | 5 ++--- runtime/vm/store_buffer.cc | 4 ++-- runtime/vm/store_buffer.h | 5 +++-- runtime/vm/stub_code.cc | 4 ++-- runtime/vm/thread.h | 4 ++-- runtime/vm/thread_linux.cc | 8 ++++---- runtime/vm/thread_macos.cc | 8 ++++---- runtime/vm/thread_test.cc | 4 ++-- runtime/vm/thread_win.cc | 8 ++++---- runtime/vm/token.h | 2 +- runtime/vm/utils.h | 5 +++-- runtime/vm/utils_test.cc | 4 ++-- runtime/vm/verifier.cc | 4 ++-- runtime/vm/virtual_memory.cc | 4 ++-- runtime/vm/virtual_memory_linux.cc | 7 ++++--- runtime/vm/virtual_memory_macos.cc | 7 ++++--- runtime/vm/virtual_memory_test.cc | 4 ++-- runtime/vm/virtual_memory_win.cc | 5 +++-- runtime/vm/vm.gypi | 1 + runtime/vm/vm_sources.gypi | 2 -- runtime/vm/zone.cc | 4 ++-- runtime/vm/zone_test.cc | 4 ++-- 119 files changed, 289 insertions(+), 291 deletions(-) rename runtime/{vm => platform}/assert.cc (91%) rename runtime/{vm => platform}/assert.h (98%) create mode 100644 runtime/platform/platform_headers.gypi diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi index e9ff87c8984..d15043ca237 100644 --- a/runtime/bin/bin.gypi +++ b/runtime/bin/bin.gypi @@ -22,7 +22,7 @@ ], 'includes': [ 'builtin_sources.gypi', - '../platform/platform_sources.gypi', + '../platform/platform_headers.gypi', ], 'sources/': [ ['exclude', '\\.(cc|h)$'], diff --git a/runtime/bin/builtin.h b/runtime/bin/builtin.h index b145e6350d8..32a713bffc1 100644 --- a/runtime/bin/builtin.h +++ b/runtime/bin/builtin.h @@ -9,25 +9,9 @@ #include #include "include/dart_api.h" +#include "platform/assert.h" #include "platform/globals.h" -#ifdef DEBUG -#define ASSERT(expr) assert(expr) -#else -#define ASSERT(expr) USE(expr) -#endif - -#define FATAL(error) \ - fprintf(stderr, "%s\n", error); \ - fflush(stderr); \ - abort(); - -#define UNREACHABLE() \ - FATAL("unreachable code") - -#define UNIMPLEMENTED() \ - FATAL("unimplemented code") - #define FUNCTION_NAME(name) Builtin_##name #define REGISTER_FUNCTION(name, count) \ { ""#name, FUNCTION_NAME(name), count }, diff --git a/runtime/bin/builtin_natives.cc b/runtime/bin/builtin_natives.cc index f09968ed3b1..955a8df8930 100644 --- a/runtime/bin/builtin_natives.cc +++ b/runtime/bin/builtin_natives.cc @@ -1,14 +1,15 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "bin/builtin.h" + #include #include -#include "include/dart_api.h" - -#include "bin/builtin.h" #include "bin/dartutils.h" +#include "include/dart_api.h" +#include "platform/assert.h" // List all native functions implemented in standalone dart that is used diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc index 845487433d7..9266f6a448a 100644 --- a/runtime/bin/dartutils.cc +++ b/runtime/bin/dartutils.cc @@ -5,6 +5,7 @@ #include "bin/dartutils.h" #include "bin/file.h" +#include "platform/assert.h" #include "platform/globals.h" const char* DartUtils::kDartScheme = "dart:"; diff --git a/runtime/bin/directory.cc b/runtime/bin/directory.cc index 3c9fc4d2680..739c43aaaae 100644 --- a/runtime/bin/directory.cc +++ b/runtime/bin/directory.cc @@ -1,11 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "bin/dartutils.h" #include "bin/directory.h" +#include "bin/dartutils.h" #include "include/dart_api.h" +#include "platform/assert.h" static intptr_t GetHandlerPort(Dart_Handle handle) { if (Dart_IsNull(handle)) { diff --git a/runtime/bin/file_linux.cc b/runtime/bin/file_linux.cc index 00a0e4ec223..8f9a5eb6707 100644 --- a/runtime/bin/file_linux.cc +++ b/runtime/bin/file_linux.cc @@ -2,6 +2,8 @@ // 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 "bin/file.h" + #include #include #include @@ -9,7 +11,6 @@ #include #include "bin/builtin.h" -#include "bin/file.h" class FileHandle { public: @@ -158,7 +159,7 @@ char* File::GetCanonicalPath(const char* pathname) { do { abs_path = realpath(pathname, NULL); } while (abs_path == NULL && errno == EINTR); - assert(abs_path == NULL || IsAbsolutePath(abs_path)); + ASSERT(abs_path == NULL || IsAbsolutePath(abs_path)); } return abs_path; } diff --git a/runtime/bin/file_macos.cc b/runtime/bin/file_macos.cc index 3187f9040fb..2224f0fc11b 100644 --- a/runtime/bin/file_macos.cc +++ b/runtime/bin/file_macos.cc @@ -2,6 +2,8 @@ // 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 "bin/file.h" + #include #include #include @@ -10,7 +12,6 @@ #include #include "bin/builtin.h" -#include "bin/file.h" class FileHandle { public: @@ -165,7 +166,7 @@ char* File::GetCanonicalPath(const char* pathname) { do { abs_path = realpath(pathname, NULL); } while (abs_path == NULL && errno == EINTR); - assert(abs_path == NULL || IsAbsolutePath(abs_path)); + ASSERT(abs_path == NULL || IsAbsolutePath(abs_path)); } return abs_path; } diff --git a/runtime/bin/file_test.cc b/runtime/bin/file_test.cc index 787c194ac46..da97b246a75 100644 --- a/runtime/bin/file_test.cc +++ b/runtime/bin/file_test.cc @@ -3,8 +3,8 @@ // BSD-style license that can be found in the LICENSE file. #include "bin/file.h" +#include "platform/assert.h" #include "platform/globals.h" -#include "vm/assert.h" #include "vm/unit_test.h" diff --git a/runtime/bin/file_win.cc b/runtime/bin/file_win.cc index 6d0522145d3..6ddd54a276e 100644 --- a/runtime/bin/file_win.cc +++ b/runtime/bin/file_win.cc @@ -1,7 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "bin/file.h" + #include #include #include @@ -9,7 +11,6 @@ #include #include "bin/builtin.h" -#include "bin/file.h" class FileHandle { public: diff --git a/runtime/bin/thread_pool_test.cc b/runtime/bin/thread_pool_test.cc index 1c85ef68561..a5712006008 100644 --- a/runtime/bin/thread_pool_test.cc +++ b/runtime/bin/thread_pool_test.cc @@ -1,13 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "bin/thread_pool.h" - -// TODO(sgjesse): Get rid of these #undefs -#undef FATAL -#undef ASSERT -#include "vm/assert.h" +#include "platform/assert.h" #include "platform/globals.h" #include "vm/unit_test.h" diff --git a/runtime/lib/array.cc b/runtime/lib/array.cc index 02bfedbd12c..9bf712e5531 100644 --- a/runtime/lib/array.cc +++ b/runtime/lib/array.cc @@ -1,11 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/bootstrap_natives.h" - #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/bigint_operations.h" #include "vm/exceptions.h" #include "vm/native_entry.h" diff --git a/runtime/lib/byte_buffer.cc b/runtime/lib/byte_buffer.cc index caa295b4b09..c69436bb8b3 100644 --- a/runtime/lib/byte_buffer.cc +++ b/runtime/lib/byte_buffer.cc @@ -1,12 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/bootstrap_natives.h" - +#include "platform/assert.h" #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/bigint_operations.h" +#include "vm/bootstrap_natives.h" #include "vm/exceptions.h" #include "vm/native_entry.h" #include "vm/object.h" diff --git a/runtime/lib/isolate.cc b/runtime/lib/isolate.cc index d3f9bca19fa..494e56e2eef 100644 --- a/runtime/lib/isolate.cc +++ b/runtime/lib/isolate.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/bootstrap_natives.h" - -#include "vm/assert.h" #include "vm/class_finalizer.h" #include "vm/dart.h" #include "vm/dart_api_impl.h" diff --git a/runtime/lib/regexp.cc b/runtime/lib/regexp.cc index 7a528a09e6f..713b38df38d 100644 --- a/runtime/lib/regexp.cc +++ b/runtime/lib/regexp.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/bootstrap_natives.h" - -#include "vm/assert.h" #include "vm/exceptions.h" #include "vm/native_entry.h" #include "vm/object.h" diff --git a/runtime/lib/regexp_jsc.cc b/runtime/lib/regexp_jsc.cc index 2ae19a2186c..0066aa7cc54 100644 --- a/runtime/lib/regexp_jsc.cc +++ b/runtime/lib/regexp_jsc.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. // This file encapsulates all the interaction with the @@ -6,12 +6,11 @@ #include "lib/regexp_jsc.h" +#include "platform/assert.h" #include "vm/allocation.h" -#include "vm/assert.h" #include "vm/exceptions.h" #include "vm/globals.h" #include "vm/isolate.h" - #include "third_party/jscre/pcre.h" namespace dart { diff --git a/runtime/vm/assert.cc b/runtime/platform/assert.cc similarity index 91% rename from runtime/vm/assert.cc rename to runtime/platform/assert.cc index ecda4d12b8f..2f3e145e47b 100644 --- a/runtime/vm/assert.cc +++ b/runtime/platform/assert.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. @@ -6,7 +6,8 @@ #include #include -#include "vm/assert.h" +#include "platform/assert.h" +#include "vm/globals.h" namespace dart { diff --git a/runtime/vm/assert.h b/runtime/platform/assert.h similarity index 98% rename from runtime/vm/assert.h rename to runtime/platform/assert.h index 2e7eba5d7b8..0bfd8eef4c2 100644 --- a/runtime/vm/assert.h +++ b/runtime/platform/assert.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. -#ifndef VM_ASSERT_H_ -#define VM_ASSERT_H_ +#ifndef PLATFORM_ASSERT_H_ +#define PLATFORM_ASSERT_H_ // TODO(5411406): include sstream for now, once we have a Utils::toString() // implemented for all the primitive types we can replace the usage of @@ -13,7 +13,7 @@ #include #endif -#include "vm/globals.h" +#include "platform/globals.h" #if !defined(DEBUG) && !defined(NDEBUG) #error neither DEBUG nor NDEBUG defined @@ -293,4 +293,4 @@ void DynamicAssertionHelper::GreaterEqual(const E& left, const A& right) { #define WARN2(format, p1, p2) \ dart::Expect(__FILE__, __LINE__).Fail(format, (p1), (p2)) -#endif // VM_ASSERT_H_ +#endif // PLATFORM_ASSERT_H_ diff --git a/runtime/platform/platform_headers.gypi b/runtime/platform/platform_headers.gypi new file mode 100644 index 00000000000..c64023efb65 --- /dev/null +++ b/runtime/platform/platform_headers.gypi @@ -0,0 +1,13 @@ +# Copyright (c) 2012, 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. + +# This file contains headers shared between the vm and bin components. +{ + 'sources': [ + 'assert.h', + 'globals.h', + 'c99_support_win.h', + 'inttypes_support_win.h', + ], +} diff --git a/runtime/platform/platform_sources.gypi b/runtime/platform/platform_sources.gypi index 8f97acdb6a5..58ee91bf2f7 100644 --- a/runtime/platform/platform_sources.gypi +++ b/runtime/platform/platform_sources.gypi @@ -5,8 +5,6 @@ # This file contains sources shared between the vm and bin components. { 'sources': [ - 'globals.h', - 'c99_support_win.h', - 'inttypes_support_win.h', + 'assert.cc', ], } diff --git a/runtime/vm/allocation.cc b/runtime/vm/allocation.cc index 83eca039999..f66aae8819c 100644 --- a/runtime/vm/allocation.cc +++ b/runtime/vm/allocation.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/allocation.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/isolate.h" #include "vm/zone.h" diff --git a/runtime/vm/allocation.h b/runtime/vm/allocation.h index 4338583da26..e77fd3dc629 100644 --- a/runtime/vm/allocation.h +++ b/runtime/vm/allocation.h @@ -1,11 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_ALLOCATION_H_ #define VM_ALLOCATION_H_ -#include "vm/assert.h" +#include "platform/assert.h" +#include "vm/globals.h" namespace dart { diff --git a/runtime/vm/allocation_test.cc b/runtime/vm/allocation_test.cc index a97cb8c5a16..56aa42aff00 100644 --- a/runtime/vm/allocation_test.cc +++ b/runtime/vm/allocation_test.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/allocation.h" -#include "vm/assert.h" #include "vm/longjump.h" #include "vm/unit_test.h" diff --git a/runtime/vm/assembler.h b/runtime/vm/assembler.h index 1ad8417461e..fb8b0c324f2 100644 --- a/runtime/vm/assembler.h +++ b/runtime/vm/assembler.h @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_ASSEMBLER_H_ #define VM_ASSEMBLER_H_ +#include "platform/assert.h" #include "vm/allocation.h" -#include "vm/assert.h" #include "vm/globals.h" #include "vm/growable_array.h" #include "vm/object.h" diff --git a/runtime/vm/assembler_arm.h b/runtime/vm/assembler_arm.h index 28a1463e524..edbaeb3b6fd 100644 --- a/runtime/vm/assembler_arm.h +++ b/runtime/vm/assembler_arm.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. @@ -9,7 +9,7 @@ #error Do not include assembler_arm.h directly; use assembler.h instead. #endif -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/constants_arm.h" namespace dart { diff --git a/runtime/vm/assembler_ia32.h b/runtime/vm/assembler_ia32.h index be92049cf74..9de739f7ccd 100644 --- a/runtime/vm/assembler_ia32.h +++ b/runtime/vm/assembler_ia32.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. @@ -9,7 +9,7 @@ #error Do not include assembler_ia32.h directly; use assembler.h instead. #endif -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/constants_ia32.h" #include "vm/utils.h" diff --git a/runtime/vm/assembler_x64.h b/runtime/vm/assembler_x64.h index fcaa70bdf0d..06d0500341f 100644 --- a/runtime/vm/assembler_x64.h +++ b/runtime/vm/assembler_x64.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. @@ -9,7 +9,7 @@ #error Do not include assembler_x64.h directly; use assembler.h instead. #endif -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/constants_x64.h" #include "vm/utils.h" diff --git a/runtime/vm/assert_test.cc b/runtime/vm/assert_test.cc index c25766a82b9..625f23b7d7e 100644 --- a/runtime/vm/assert_test.cc +++ b/runtime/vm/assert_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/unit_test.h" diff --git a/runtime/vm/ast.h b/runtime/vm/ast.h index 7b221416c1b..fdd8699426a 100644 --- a/runtime/vm/ast.h +++ b/runtime/vm/ast.h @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_AST_H_ #define VM_AST_H_ +#include "platform/assert.h" #include "vm/allocation.h" -#include "vm/assert.h" #include "vm/growable_array.h" #include "vm/ic_data.h" #include "vm/scopes.h" diff --git a/runtime/vm/ast_printer_test.cc b/runtime/vm/ast_printer_test.cc index b1787747c7a..96ab84f6ba3 100644 --- a/runtime/vm/ast_printer_test.cc +++ b/runtime/vm/ast_printer_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/ast_printer.h" #include "vm/heap.h" #include "vm/isolate.h" diff --git a/runtime/vm/ast_test.cc b/runtime/vm/ast_test.cc index 7bbf708824e..1bd734c2a72 100644 --- a/runtime/vm/ast_test.cc +++ b/runtime/vm/ast_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/ast.h" #include "vm/heap.h" #include "vm/isolate.h" diff --git a/runtime/vm/bigint_operations_test.cc b/runtime/vm/bigint_operations_test.cc index d658688cef9..73a610789b6 100644 --- a/runtime/vm/bigint_operations_test.cc +++ b/runtime/vm/bigint_operations_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/bigint_operations.h" #include "vm/object.h" #include "vm/object_store.h" diff --git a/runtime/vm/bitfield_test.cc b/runtime/vm/bitfield_test.cc index 49a6ae22412..7728b29cb05 100644 --- a/runtime/vm/bitfield_test.cc +++ b/runtime/vm/bitfield_test.cc @@ -1,8 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" +#include "vm/globals.h" #include "vm/bitfield.h" #include "vm/unit_test.h" diff --git a/runtime/vm/boolfield.h b/runtime/vm/boolfield.h index 23761d9e509..64117f27a04 100644 --- a/runtime/vm/boolfield.h +++ b/runtime/vm/boolfield.h @@ -1,10 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_BOOLFIELD_H_ #define VM_BOOLFIELD_H_ +#include "vm/globals.h" + namespace dart { // BoolField is a template for encoding and decoding a bit inside an diff --git a/runtime/vm/boolfield_test.cc b/runtime/vm/boolfield_test.cc index a1949420baf..1e21b1b30ca 100644 --- a/runtime/vm/boolfield_test.cc +++ b/runtime/vm/boolfield_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/boolfield.h" #include "vm/unit_test.h" diff --git a/runtime/vm/class_finalizer_test.cc b/runtime/vm/class_finalizer_test.cc index 0d81f9249b6..2c8f01df671 100644 --- a/runtime/vm/class_finalizer_test.cc +++ b/runtime/vm/class_finalizer_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/class_finalizer.h" #include "vm/unit_test.h" diff --git a/runtime/vm/code_generator_ia32_test.cc b/runtime/vm/code_generator_ia32_test.cc index 3657dea0213..9277b594284 100644 --- a/runtime/vm/code_generator_ia32_test.cc +++ b/runtime/vm/code_generator_ia32_test.cc @@ -1,16 +1,15 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/globals.h" #if defined(TARGET_ARCH_IA32) -#include "vm/code_generator.h" - #include "vm/ast.h" #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/class_finalizer.h" +#include "vm/code_generator.h" #include "vm/compiler.h" #include "vm/dart_entry.h" #include "vm/native_entry.h" diff --git a/runtime/vm/code_generator_x64_test.cc b/runtime/vm/code_generator_x64_test.cc index 51a62bc4fbb..6dd10fada7b 100644 --- a/runtime/vm/code_generator_x64_test.cc +++ b/runtime/vm/code_generator_x64_test.cc @@ -1,16 +1,15 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/globals.h" #if defined(TARGET_ARCH_X64) -#include "vm/code_generator.h" - #include "vm/ast.h" #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/class_finalizer.h" +#include "vm/code_generator.h" #include "vm/compiler.h" #include "vm/dart_entry.h" #include "vm/native_entry.h" diff --git a/runtime/vm/code_index_table.h b/runtime/vm/code_index_table.h index 5cfeca0b72f..417d1909f28 100644 --- a/runtime/vm/code_index_table.h +++ b/runtime/vm/code_index_table.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_CODE_INDEX_TABLE_H_ #define VM_CODE_INDEX_TABLE_H_ -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" namespace dart { diff --git a/runtime/vm/code_index_table_test.cc b/runtime/vm/code_index_table_test.cc index 4e939f50da5..3a14d43867e 100644 --- a/runtime/vm/code_index_table_test.cc +++ b/runtime/vm/code_index_table_test.cc @@ -1,11 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/code_index_table.h" - -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/class_finalizer.h" +#include "vm/code_index_table.h" #include "vm/compiler.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/compiler_test.cc b/runtime/vm/compiler_test.cc index 820bca1bfdc..886f3a78e92 100644 --- a/runtime/vm/compiler_test.cc +++ b/runtime/vm/compiler_test.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/compiler.h" - -#include "vm/assert.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/constants_ia32.h b/runtime/vm/constants_ia32.h index 18be009bf0b..683da5edcba 100644 --- a/runtime/vm/constants_ia32.h +++ b/runtime/vm/constants_ia32.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_CONSTANTS_IA32_H_ #define VM_CONSTANTS_IA32_H_ -#include "vm/assert.h" +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/cpu_test.cc b/runtime/vm/cpu_test.cc index 001e266d5bf..3b2b07b545a 100644 --- a/runtime/vm/cpu_test.cc +++ b/runtime/vm/cpu_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/cpu.h" #include "vm/globals.h" #include "vm/unit_test.h" diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc index 6736e8cfc55..529f4d06fb1 100644 --- a/runtime/vm/dart_api_impl_test.cc +++ b/runtime/vm/dart_api_impl_test.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "include/dart_api.h" - -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/dart_api_impl.h" #include "vm/dart_api_state.h" #include "vm/thread.h" diff --git a/runtime/vm/dart_entry_test.cc b/runtime/vm/dart_entry_test.cc index e86d1085839..3021a347699 100644 --- a/runtime/vm/dart_entry_test.cc +++ b/runtime/vm/dart_entry_test.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/compiler.h" #include "vm/dart_entry.h" #include "vm/object.h" diff --git a/runtime/vm/debugger_api_impl_test.cc b/runtime/vm/debugger_api_impl_test.cc index dfb85635da4..d0907f12c64 100644 --- a/runtime/vm/debugger_api_impl_test.cc +++ b/runtime/vm/debugger_api_impl_test.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "include/dart_debugger_api.h" - -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/unit_test.h" namespace dart { diff --git a/runtime/vm/debuginfo.h b/runtime/vm/debuginfo.h index b3de437c655..778446da6e3 100644 --- a/runtime/vm/debuginfo.h +++ b/runtime/vm/debuginfo.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_DEBUGINFO_H_ #define VM_DEBUGINFO_H_ -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" #include "vm/utils.h" diff --git a/runtime/vm/disassembler_arm.cc b/runtime/vm/disassembler_arm.cc index 9170d804918..bea7a3af943 100644 --- a/runtime/vm/disassembler_arm.cc +++ b/runtime/vm/disassembler_arm.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/disassembler.h" + +#include "platform/assert.h" #include "vm/globals.h" // Needed here to get TARGET_ARCH_ARM. #if defined(TARGET_ARCH_ARM) -#include "vm/disassembler.h" - -#include "vm/assert.h" namespace dart { diff --git a/runtime/vm/disassembler_ia32.cc b/runtime/vm/disassembler_ia32.cc index 1b5941e4c42..75b6a8b201d 100644 --- a/runtime/vm/disassembler_ia32.cc +++ b/runtime/vm/disassembler_ia32.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/disassembler.h" + #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. #if defined(TARGET_ARCH_IA32) -#include "vm/disassembler.h" - #include "vm/allocation.h" #include "vm/code_index_table.h" #include "vm/heap.h" diff --git a/runtime/vm/disassembler_x64.cc b/runtime/vm/disassembler_x64.cc index 98142a68b86..8787ae1763b 100644 --- a/runtime/vm/disassembler_x64.cc +++ b/runtime/vm/disassembler_x64.cc @@ -1,7 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/disassembler.h" + #if !defined(_WIN32) // Disassembler is not yet supported under WIN32. #include #include @@ -9,13 +11,10 @@ #include #endif +#include "platform/assert.h" #include "vm/globals.h" // Needed here to get TARGET_ARCH_X64. #if defined(TARGET_ARCH_X64) -#include "vm/disassembler.h" - -#include "vm/assert.h" - namespace dart { void Disassembler::Disassemble(uword start, diff --git a/runtime/vm/exceptions_test.cc b/runtime/vm/exceptions_test.cc index dc3f27abde7..c71e485fbf6 100644 --- a/runtime/vm/exceptions_test.cc +++ b/runtime/vm/exceptions_test.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "include/dart_api.h" - -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/dart_api_impl.h" #include "vm/unit_test.h" diff --git a/runtime/vm/flags.cc b/runtime/vm/flags.cc index 584731f6a70..ef3c7187b53 100644 --- a/runtime/vm/flags.cc +++ b/runtime/vm/flags.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/flags.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/os.h" namespace dart { diff --git a/runtime/vm/flags.h b/runtime/vm/flags.h index 00339d19b64..778ed33fdaa 100644 --- a/runtime/vm/flags.h +++ b/runtime/vm/flags.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_FLAGS_H_ #define VM_FLAGS_H_ -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" typedef const char* charp; diff --git a/runtime/vm/flags_test.cc b/runtime/vm/flags_test.cc index 3a3813d701b..d7f95c4e279 100644 --- a/runtime/vm/flags_test.cc +++ b/runtime/vm/flags_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/flags.h" #include "vm/heap.h" #include "vm/unit_test.h" diff --git a/runtime/vm/freelist.h b/runtime/vm/freelist.h index b63a1f1847f..64f0574811c 100644 --- a/runtime/vm/freelist.h +++ b/runtime/vm/freelist.h @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_FREELIST_H_ #define VM_FREELIST_H_ +#include "platform/assert.h" #include "vm/allocation.h" -#include "vm/assert.h" #include "vm/raw_object.h" namespace dart { diff --git a/runtime/vm/freelist_test.cc b/runtime/vm/freelist_test.cc index d6f0186ecf6..a64ce34f7fb 100644 --- a/runtime/vm/freelist_test.cc +++ b/runtime/vm/freelist_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/freelist.h" #include "vm/unit_test.h" diff --git a/runtime/vm/growable_array_test.cc b/runtime/vm/growable_array_test.cc index c5527269332..2adf39d0c15 100644 --- a/runtime/vm/growable_array_test.cc +++ b/runtime/vm/growable_array_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/growable_array.h" #include "vm/unit_test.h" diff --git a/runtime/vm/handles.cc b/runtime/vm/handles.cc index 51bf852950c..fd4e1d32bab 100644 --- a/runtime/vm/handles.cc +++ b/runtime/vm/handles.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/handles.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/flags.h" #include "vm/isolate.h" #include "vm/os.h" diff --git a/runtime/vm/handles_test.cc b/runtime/vm/handles_test.cc index 1b3ce381503..c71866fba86 100644 --- a/runtime/vm/handles_test.cc +++ b/runtime/vm/handles_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/flags.h" #include "vm/handles.h" #include "vm/heap.h" diff --git a/runtime/vm/heap.cc b/runtime/vm/heap.cc index f625256c8fe..76b343928d4 100644 --- a/runtime/vm/heap.cc +++ b/runtime/vm/heap.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/heap.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/compiler_stats.h" #include "vm/flags.h" #include "vm/isolate.h" diff --git a/runtime/vm/heap.h b/runtime/vm/heap.h index 1dc8ac109aa..1e6051b8bfb 100644 --- a/runtime/vm/heap.h +++ b/runtime/vm/heap.h @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_HEAP_H_ #define VM_HEAP_H_ +#include "platform/assert.h" #include "vm/allocation.h" -#include "vm/assert.h" #include "vm/flags.h" #include "vm/globals.h" #include "vm/pages.h" diff --git a/runtime/vm/heap_test.cc b/runtime/vm/heap_test.cc index 9654abd9502..89986b16d13 100644 --- a/runtime/vm/heap_test.cc +++ b/runtime/vm/heap_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" #include "vm/heap.h" #include "vm/unit_test.h" diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc index 4b3993b2e56..6e330511f08 100644 --- a/runtime/vm/isolate.cc +++ b/runtime/vm/isolate.cc @@ -1,12 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/isolate.h" #include "include/dart_api.h" - -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/bigint_store.h" #include "vm/code_index_table.h" #include "vm/compiler_stats.h" diff --git a/runtime/vm/isolate.h b/runtime/vm/isolate.h index f25e9544249..cc7755e343d 100644 --- a/runtime/vm/isolate.h +++ b/runtime/vm/isolate.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. @@ -6,7 +6,7 @@ #define VM_ISOLATE_H_ #include "include/dart_api.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/store_buffer.h" #include "vm/timer.h" diff --git a/runtime/vm/isolate_linux.cc b/runtime/vm/isolate_linux.cc index ea9e184fc00..e530f18a67f 100644 --- a/runtime/vm/isolate_linux.cc +++ b/runtime/vm/isolate_linux.cc @@ -1,12 +1,13 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/isolate.h" + #include #include -#include "vm/assert.h" -#include "vm/isolate.h" +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/isolate_macos.cc b/runtime/vm/isolate_macos.cc index 5ebf08000f5..ac5432fdc34 100644 --- a/runtime/vm/isolate_macos.cc +++ b/runtime/vm/isolate_macos.cc @@ -1,12 +1,13 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/isolate.h" + #include #include -#include "vm/assert.h" -#include "vm/isolate.h" +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/isolate_test.cc b/runtime/vm/isolate_test.cc index 2fd240702d3..0c41182fbcc 100644 --- a/runtime/vm/isolate_test.cc +++ b/runtime/vm/isolate_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" #include "vm/isolate.h" #include "vm/unit_test.h" diff --git a/runtime/vm/isolate_win.cc b/runtime/vm/isolate_win.cc index 2170d8b1762..80af81016fc 100644 --- a/runtime/vm/isolate_win.cc +++ b/runtime/vm/isolate_win.cc @@ -1,11 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" -#include "vm/globals.h" #include "vm/isolate.h" +#include "platform/assert.h" +#include "vm/globals.h" + namespace dart { DWORD isolate_key = TLS_OUT_OF_INDEXES; diff --git a/runtime/vm/isolate_win.h b/runtime/vm/isolate_win.h index 2561746681f..dd4d5c298a5 100644 --- a/runtime/vm/isolate_win.h +++ b/runtime/vm/isolate_win.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. @@ -9,7 +9,7 @@ #error Do not include isolate_win.h directly; use isolate.h instead. #endif -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" namespace dart { diff --git a/runtime/vm/memory_region.h b/runtime/vm/memory_region.h index 9078a781388..c9543c23c17 100644 --- a/runtime/vm/memory_region.h +++ b/runtime/vm/memory_region.h @@ -1,11 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_MEMORY_REGION_H_ #define VM_MEMORY_REGION_H_ -#include "vm/assert.h" +#include "platform/assert.h" +#include "vm/globals.h" namespace dart { diff --git a/runtime/vm/memory_region_test.cc b/runtime/vm/memory_region_test.cc index 0575e769f4b..1f46b18725d 100644 --- a/runtime/vm/memory_region_test.cc +++ b/runtime/vm/memory_region_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/memory_region.h" #include "vm/unit_test.h" diff --git a/runtime/vm/message_queue_test.cc b/runtime/vm/message_queue_test.cc index 789717ad48b..e2db32ceb00 100644 --- a/runtime/vm/message_queue_test.cc +++ b/runtime/vm/message_queue_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/message_queue.h" #include "vm/unit_test.h" diff --git a/runtime/vm/native_arguments.cc b/runtime/vm/native_arguments.cc index 2f33efa8593..52ef57ff270 100644 --- a/runtime/vm/native_arguments.cc +++ b/runtime/vm/native_arguments.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/native_arguments.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/object.h" namespace dart { diff --git a/runtime/vm/native_arguments.h b/runtime/vm/native_arguments.h index 794a0eea377..a6901249708 100644 --- a/runtime/vm/native_arguments.h +++ b/runtime/vm/native_arguments.h @@ -1,11 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_NATIVE_ARGUMENTS_H_ #define VM_NATIVE_ARGUMENTS_H_ -#include "vm/assert.h" +#include "platform/assert.h" +#include "vm/globals.h" namespace dart { diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc index dc802031b97..5a809952372 100644 --- a/runtime/vm/object.cc +++ b/runtime/vm/object.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/object.h" +#include "platform/assert.h" #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/bigint_operations.h" #include "vm/bootstrap.h" #include "vm/code_generator.h" diff --git a/runtime/vm/object.h b/runtime/vm/object.h index a4cca50575e..5e220fbc5d0 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_OBJECT_H_ #define VM_OBJECT_H_ -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/dart.h" #include "vm/globals.h" #include "vm/handles.h" diff --git a/runtime/vm/object_arm_test.cc b/runtime/vm/object_arm_test.cc index 4f5b6262422..7056f92dd54 100644 --- a/runtime/vm/object_arm_test.cc +++ b/runtime/vm/object_arm_test.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/globals.h" #if defined(TARGET_ARCH_ARM) #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/object_ia32_test.cc b/runtime/vm/object_ia32_test.cc index c047f8fcfee..2c9785087d8 100644 --- a/runtime/vm/object_ia32_test.cc +++ b/runtime/vm/object_ia32_test.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/globals.h" #if defined(TARGET_ARCH_IA32) #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/object_test.cc b/runtime/vm/object_test.cc index 7ac1692fff1..269b479c907 100644 --- a/runtime/vm/object_test.cc +++ b/runtime/vm/object_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/assembler.h" #include "vm/bigint_operations.h" #include "vm/isolate.h" diff --git a/runtime/vm/object_x64_test.cc b/runtime/vm/object_x64_test.cc index fc0c02d1946..e1e64d203e8 100644 --- a/runtime/vm/object_x64_test.cc +++ b/runtime/vm/object_x64_test.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/globals.h" #if defined(TARGET_ARCH_X64) #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/object.h" #include "vm/unit_test.h" diff --git a/runtime/vm/os_linux.cc b/runtime/vm/os_linux.cc index 4917956ab1a..b2233970892 100644 --- a/runtime/vm/os_linux.cc +++ b/runtime/vm/os_linux.cc @@ -1,7 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/os.h" + #include #include #include @@ -11,7 +13,6 @@ #include #include "vm/isolate.h" -#include "vm/os.h" #include "vm/utils.h" namespace dart { diff --git a/runtime/vm/os_macos.cc b/runtime/vm/os_macos.cc index 0f1d68f087e..8f4be1b19f0 100644 --- a/runtime/vm/os_macos.cc +++ b/runtime/vm/os_macos.cc @@ -1,7 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/os.h" + #include #include #include @@ -12,7 +14,6 @@ #include #include "vm/isolate.h" -#include "vm/os.h" #include "vm/utils.h" namespace dart { diff --git a/runtime/vm/os_test.cc b/runtime/vm/os_test.cc index 8bdd31326be..25d36e76d61 100644 --- a/runtime/vm/os_test.cc +++ b/runtime/vm/os_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" #include "vm/os.h" #include "vm/unit_test.h" diff --git a/runtime/vm/os_win.cc b/runtime/vm/os_win.cc index 70d239cf172..2acef13fe30 100644 --- a/runtime/vm/os_win.cc +++ b/runtime/vm/os_win.cc @@ -1,11 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/os.h" + #include -#include "vm/assert.h" -#include "vm/os.h" +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/pages.cc b/runtime/vm/pages.cc index 2a140c92785..052329c582d 100644 --- a/runtime/vm/pages.cc +++ b/runtime/vm/pages.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/pages.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/gc_marker.h" #include "vm/gc_sweeper.h" #include "vm/object.h" diff --git a/runtime/vm/pages_test.cc b/runtime/vm/pages_test.cc index 20b92292c9f..b11c379d5a2 100644 --- a/runtime/vm/pages_test.cc +++ b/runtime/vm/pages_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/pages.h" #include "vm/unit_test.h" diff --git a/runtime/vm/port_test.cc b/runtime/vm/port_test.cc index 1488f4ae0f4..c5762dab224 100644 --- a/runtime/vm/port_test.cc +++ b/runtime/vm/port_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/message_queue.h" #include "vm/os.h" #include "vm/port.h" diff --git a/runtime/vm/random.cc b/runtime/vm/random.cc index 1370e06bae0..ef2455c92c1 100644 --- a/runtime/vm/random.cc +++ b/runtime/vm/random.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/random.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/isolate.h" namespace dart { diff --git a/runtime/vm/random_test.cc b/runtime/vm/random_test.cc index d5be2e0c557..2b7f726a218 100644 --- a/runtime/vm/random_test.cc +++ b/runtime/vm/random_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" #include "vm/random.h" #include "vm/unit_test.h" diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h index f4847fc1b58..09ad604ca28 100644 --- a/runtime/vm/raw_object.h +++ b/runtime/vm/raw_object.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_RAW_OBJECT_H_ #define VM_RAW_OBJECT_H_ -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/globals.h" #include "vm/snapshot.h" diff --git a/runtime/vm/resolver_test.cc b/runtime/vm/resolver_test.cc index 0216d55e9f3..aa874ff85dd 100644 --- a/runtime/vm/resolver_test.cc +++ b/runtime/vm/resolver_test.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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/assert.h" #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/class_finalizer.h" #include "vm/compiler.h" #include "vm/dart_entry.h" diff --git a/runtime/vm/scanner.cc b/runtime/vm/scanner.cc index 49e27ee721b..ec9becda8db 100644 --- a/runtime/vm/scanner.cc +++ b/runtime/vm/scanner.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/scanner.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/flags.h" #include "vm/object.h" #include "vm/thread.h" diff --git a/runtime/vm/scanner_test.cc b/runtime/vm/scanner_test.cc index b83a6453450..e0e2e489b2e 100644 --- a/runtime/vm/scanner_test.cc +++ b/runtime/vm/scanner_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/os.h" #include "vm/scanner.h" #include "vm/token.h" diff --git a/runtime/vm/scavenger.h b/runtime/vm/scavenger.h index 30659c707ab..f03a70b6e6e 100644 --- a/runtime/vm/scavenger.h +++ b/runtime/vm/scavenger.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_SCAVENGER_H_ #define VM_SCAVENGER_H_ -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/flags.h" #include "vm/globals.h" #include "vm/raw_object.h" diff --git a/runtime/vm/scopes_test.cc b/runtime/vm/scopes_test.cc index e437b20ecd9..687f36ebd8a 100644 --- a/runtime/vm/scopes_test.cc +++ b/runtime/vm/scopes_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/ast.h" #include "vm/scopes.h" #include "vm/unit_test.h" diff --git a/runtime/vm/snapshot.cc b/runtime/vm/snapshot.cc index 0dc1442f21b..3a95c294483 100644 --- a/runtime/vm/snapshot.cc +++ b/runtime/vm/snapshot.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/snapshot.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/bootstrap.h" #include "vm/heap.h" #include "vm/object.h" diff --git a/runtime/vm/snapshot.h b/runtime/vm/snapshot.h index 6c363518b72..03433f2eea5 100644 --- a/runtime/vm/snapshot.h +++ b/runtime/vm/snapshot.h @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_SNAPSHOT_H_ #define VM_SNAPSHOT_H_ +#include "platform/assert.h" #include "vm/allocation.h" -#include "vm/assert.h" #include "vm/bitfield.h" #include "vm/globals.h" #include "vm/growable_array.h" diff --git a/runtime/vm/snapshot_test.cc b/runtime/vm/snapshot_test.cc index 1b983afa975..2c99fbd893f 100644 --- a/runtime/vm/snapshot_test.cc +++ b/runtime/vm/snapshot_test.cc @@ -1,12 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/snapshot.h" - -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/bigint_operations.h" #include "vm/class_finalizer.h" +#include "vm/snapshot.h" #include "vm/unit_test.h" namespace dart { diff --git a/runtime/vm/stack_frame_test.cc b/runtime/vm/stack_frame_test.cc index 2bde6028b97..7a91940d8d4 100644 --- a/runtime/vm/stack_frame_test.cc +++ b/runtime/vm/stack_frame_test.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "include/dart_api.h" - -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/class_finalizer.h" #include "vm/compiler.h" #include "vm/dart_api_impl.h" diff --git a/runtime/vm/store_buffer.cc b/runtime/vm/store_buffer.cc index c73bda82db9..5df07ee24af 100644 --- a/runtime/vm/store_buffer.cc +++ b/runtime/vm/store_buffer.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/store_buffer.h" -#include "vm/assert.h" +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/store_buffer.h b/runtime/vm/store_buffer.h index 0f25ddc202c..ff2f3fee2a9 100644 --- a/runtime/vm/store_buffer.h +++ b/runtime/vm/store_buffer.h @@ -1,11 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_STORE_BUFFER_H_ #define VM_STORE_BUFFER_H_ -#include "vm/assert.h" +#include "platform/assert.h" +#include "vm/globals.h" namespace dart { diff --git a/runtime/vm/stub_code.cc b/runtime/vm/stub_code.cc index ff3b80bca8e..42c1bc13da9 100644 --- a/runtime/vm/stub_code.cc +++ b/runtime/vm/stub_code.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/stub_code.h" +#include "platform/assert.h" #include "vm/assembler.h" -#include "vm/assert.h" #include "vm/disassembler.h" #include "vm/flags.h" #include "vm/virtual_memory.h" diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h index 353d142d144..2c5fad00702 100644 --- a/runtime/vm/thread.h +++ b/runtime/vm/thread.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_THREAD_H_ #define VM_THREAD_H_ -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/allocation.h" #include "vm/globals.h" #include "vm/isolate.h" diff --git a/runtime/vm/thread_linux.cc b/runtime/vm/thread_linux.cc index faf445fba70..e537eb6e66d 100644 --- a/runtime/vm/thread_linux.cc +++ b/runtime/vm/thread_linux.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/thread.h" + #include #include -#include "vm/thread.h" - -#include "vm/assert.h" +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/thread_macos.cc b/runtime/vm/thread_macos.cc index 97e09e746d4..b9a8a1d7d6c 100644 --- a/runtime/vm/thread_macos.cc +++ b/runtime/vm/thread_macos.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 - #include "vm/thread.h" -#include "vm/assert.h" +#include + +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/thread_test.cc b/runtime/vm/thread_test.cc index e8dd4dc9ca0..e69d07754e1 100644 --- a/runtime/vm/thread_test.cc +++ b/runtime/vm/thread_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/isolate.h" #include "vm/unit_test.h" #include "vm/thread.h" diff --git a/runtime/vm/thread_win.cc b/runtime/vm/thread_win.cc index 5851bf41fc2..0e5f5c1a79b 100644 --- a/runtime/vm/thread_win.cc +++ b/runtime/vm/thread_win.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 - #include "vm/thread.h" -#include "vm/assert.h" +#include + +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/token.h b/runtime/vm/token.h index 0dd0adc4649..c4365faa33b 100644 --- a/runtime/vm/token.h +++ b/runtime/vm/token.h @@ -5,7 +5,7 @@ #ifndef VM_TOKEN_H_ #define VM_TOKEN_H_ -#include "vm/assert.h" +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/utils.h b/runtime/vm/utils.h index 11072dd7b8b..855e1f18d88 100644 --- a/runtime/vm/utils.h +++ b/runtime/vm/utils.h @@ -1,11 +1,12 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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. #ifndef VM_UTILS_H_ #define VM_UTILS_H_ -#include "vm/assert.h" +#include "platform/assert.h" +#include "vm/globals.h" namespace dart { diff --git a/runtime/vm/utils_test.cc b/runtime/vm/utils_test.cc index cef0069f20f..90a1e22f2bf 100644 --- a/runtime/vm/utils_test.cc +++ b/runtime/vm/utils_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/unit_test.h" #include "vm/utils.h" diff --git a/runtime/vm/verifier.cc b/runtime/vm/verifier.cc index 37748b7593c..adb53fa8df6 100644 --- a/runtime/vm/verifier.cc +++ b/runtime/vm/verifier.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/verifier.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/dart.h" #include "vm/dart_api_state.h" #include "vm/freelist.h" diff --git a/runtime/vm/virtual_memory.cc b/runtime/vm/virtual_memory.cc index 4d647284f68..67a67e26481 100644 --- a/runtime/vm/virtual_memory.cc +++ b/runtime/vm/virtual_memory.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/virtual_memory.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/utils.h" namespace dart { diff --git a/runtime/vm/virtual_memory_linux.cc b/runtime/vm/virtual_memory_linux.cc index 00068c3aa31..f7a898ab8a6 100644 --- a/runtime/vm/virtual_memory_linux.cc +++ b/runtime/vm/virtual_memory_linux.cc @@ -1,13 +1,14 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/virtual_memory.h" + #include #include #include -#include "vm/virtual_memory.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/utils.h" namespace dart { diff --git a/runtime/vm/virtual_memory_macos.cc b/runtime/vm/virtual_memory_macos.cc index 0cf2dadc9d0..0d3f876f3d5 100644 --- a/runtime/vm/virtual_memory_macos.cc +++ b/runtime/vm/virtual_memory_macos.cc @@ -1,12 +1,13 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/virtual_memory.h" + #include #include -#include "vm/virtual_memory.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/utils.h" namespace dart { diff --git a/runtime/vm/virtual_memory_test.cc b/runtime/vm/virtual_memory_test.cc index dcc4eec4110..445b0834994 100644 --- a/runtime/vm/virtual_memory_test.cc +++ b/runtime/vm/virtual_memory_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/unit_test.h" #include "vm/virtual_memory.h" diff --git a/runtime/vm/virtual_memory_win.cc b/runtime/vm/virtual_memory_win.cc index 96c285f9d87..a3e9117d229 100644 --- a/runtime/vm/virtual_memory_win.cc +++ b/runtime/vm/virtual_memory_win.cc @@ -1,9 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/virtual_memory.h" -#include "vm/assert.h" + +#include "platform/assert.h" namespace dart { diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi index 2d4ab447bda..ab4b47cace3 100644 --- a/runtime/vm/vm.gypi +++ b/runtime/vm/vm.gypi @@ -19,6 +19,7 @@ 'type': 'static_library', 'includes': [ 'vm_sources.gypi', + '../platform/platform_headers.gypi', '../platform/platform_sources.gypi', ], 'sources/': [ diff --git a/runtime/vm/vm_sources.gypi b/runtime/vm/vm_sources.gypi index 527337c3127..5998c86c9c4 100644 --- a/runtime/vm/vm_sources.gypi +++ b/runtime/vm/vm_sources.gypi @@ -23,8 +23,6 @@ 'assembler_x64.cc', 'assembler_x64.h', 'assembler_x64_test.cc', - 'assert.cc', - 'assert.h', 'assert_test.cc', 'ast.cc', 'ast.h', diff --git a/runtime/vm/zone.cc b/runtime/vm/zone.cc index b2bedc7451b..e223d01143e 100644 --- a/runtime/vm/zone.cc +++ b/runtime/vm/zone.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/zone.h" -#include "vm/assert.h" +#include "platform/assert.h" #include "vm/flags.h" #include "vm/isolate.h" #include "vm/os.h" diff --git a/runtime/vm/zone_test.cc b/runtime/vm/zone_test.cc index 2015f74cedf..c0b3f6f3752 100644 --- a/runtime/vm/zone_test.cc +++ b/runtime/vm/zone_test.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file +// Copyright (c) 2012, 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 "vm/assert.h" +#include "platform/assert.h" #include "vm/dart.h" #include "vm/isolate.h" #include "vm/unit_test.h"