Merge arguments branch to bleeding merge.

src/v8.h

-// Copyright 2011 the V8 project authors. All rights reserved.
+// Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
 //       with the distribution.
@@ skipping 16 matching lines @@
 //
 // Top include for all V8 .cc files.
 //
 
 #ifndef V8_V8_H_
 #define V8_V8_H_
 
 #if defined(GOOGLE3)
 // Google3 special flag handling.
 #if defined(DEBUG) && defined(NDEBUG)
-// V8 only uses DEBUG and whenever it is set we are building a debug
-// version of V8. We do not use NDEBUG and simply undef it here for
-// consistency.
+// If both are defined in Google3, then we are building an optimized v8 with
+// assertions enabled.
 #undef NDEBUG
+#elif !defined(DEBUG) && !defined(NDEBUG)
+// If neither is defined in Google3, then we are building a debug v8. Mark it
+// as such.
+#define DEBUG
 #endif
 #endif  // defined(GOOGLE3)
 
 // V8 only uses DEBUG, but included external files
 // may use NDEBUG - make sure they are consistent.
 #if defined(DEBUG) && defined(NDEBUG)
 #error both DEBUG and NDEBUG are set
 #endif
 
 // Basic includes
@@ skipping 67 matching lines @@
   static bool has_been_disposed_;
   // True if we are using the crankshaft optimizing compiler.
   static bool use_crankshaft_;
 };
 
 } }  // namespace v8::internal
 
 namespace i = v8::internal;
 
 #endif  // V8_V8_H_