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

@@ -22,7 +22,7 @@
       ],
       'includes': [
         'builtin_sources.gypi',
-        '../platform/platform_sources.gypi',
+        '../platform/platform_headers.gypi',
       ],
       'sources/': [
         ['exclude', '\\.(cc|h)$'],

runtime/bin/builtin.h

@@ -9,25 +9,9 @@
 #include <stdlib.h>
 
 #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 },

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 <stdlib.h>
 #include <string.h>
 
-#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

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:";

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)) {

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 <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -9,7 +11,6 @@
 #include <libgen.h>
 
 #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;
 }

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 <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -10,7 +12,6 @@
 #include <limits.h>
 
 #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;
 }

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"
 
 

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 <fcntl.h>
 #include <io.h>
 #include <stdio.h>
@@ -9,7 +11,6 @@
 #include <sys/stat.h>
 
 #include "bin/builtin.h"
-#include "bin/file.h"
 
 class FileHandle {
  public:

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"
 

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"

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"

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"

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"

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 {

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 <sstream>
 #include <string>
 
-#include "vm/assert.h"
+#include "platform/assert.h"
+#include "vm/globals.h"
 
 namespace dart {
 

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 <string>
 #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_

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',
+  ],
+}

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',
   ],
 }

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"
 

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 {
 

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"
 

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"

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 {

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"
 

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"
 

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"
 
 

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"

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"

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"

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"

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"
 

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

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"
 

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"
 

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"

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"

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 {

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"

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"
 

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 {
 

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"

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"

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"

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 {

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"
 

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 {
 

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"

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 <errno.h>
 #include <stdio.h>
@@ -9,13 +11,10 @@
 #include <unistd.h>
 #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,

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"
 

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 {

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;

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"

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 {

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"
 

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 <errno.h>
 #include <pthread.h>
 
-#include "vm/assert.h"
-#include "vm/isolate.h"
+#include "platform/assert.h"
 
 namespace dart {
 

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 <errno.h>
 #include <pthread.h>
 
-#include "vm/assert.h"
-#include "vm/isolate.h"
+#include "platform/assert.h"
 
 namespace dart {
 

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"

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;

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 {

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 {
 

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"
 

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"
 

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 {

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 {
 

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"

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"

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"
 

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"
 

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"

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"
 

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 <errno.h>
 #include <limits.h>
 #include <time.h>
@@ -11,7 +13,6 @@
 #include <unistd.h>
 
 #include "vm/isolate.h"
-#include "vm/os.h"
 #include "vm/utils.h"
 
 namespace dart {

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 <errno.h>
 #include <limits.h>
 #include <mach/mach.h>
@@ -12,7 +14,6 @@
 #include <unistd.h>
 
 #include "vm/isolate.h"
-#include "vm/os.h"
 #include "vm/utils.h"
 
 namespace dart {

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"

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 <time.h>
 
-#include "vm/assert.h"
-#include "vm/os.h"
+#include "platform/assert.h"
 
 namespace dart {
 

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"

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"
 

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"

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 {

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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 {

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"

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 {
 

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 {