| Index: src/base/macros.h
|
| diff --git a/src/base/macros.h b/src/base/macros.h
|
| index 382c30bd221b11fb7f2f3c9801157a33ccc20e49..8556a2ca646e653656aa26dde6d34504bd249d05 100644
|
| --- a/src/base/macros.h
|
| +++ b/src/base/macros.h
|
| @@ -17,55 +17,6 @@
|
| (reinterpret_cast<intptr_t>(&(reinterpret_cast<type*>(16)->field)) - 16)
|
|
|
|
|
| -#if V8_OS_NACL
|
| -
|
| -// ARRAYSIZE_UNSAFE performs essentially the same calculation as arraysize,
|
| -// but can be used on anonymous types or types defined inside
|
| -// functions. It's less safe than arraysize as it accepts some
|
| -// (although not all) pointers. Therefore, you should use arraysize
|
| -// whenever possible.
|
| -//
|
| -// The expression ARRAYSIZE_UNSAFE(a) is a compile-time constant of type
|
| -// size_t.
|
| -//
|
| -// ARRAYSIZE_UNSAFE catches a few type errors. If you see a compiler error
|
| -//
|
| -// "warning: division by zero in ..."
|
| -//
|
| -// when using ARRAYSIZE_UNSAFE, you are (wrongfully) giving it a pointer.
|
| -// You should only use ARRAYSIZE_UNSAFE on statically allocated arrays.
|
| -//
|
| -// The following comments are on the implementation details, and can
|
| -// be ignored by the users.
|
| -//
|
| -// ARRAYSIZE_UNSAFE(arr) works by inspecting sizeof(arr) (the # of bytes in
|
| -// the array) and sizeof(*(arr)) (the # of bytes in one array
|
| -// element). If the former is divisible by the latter, perhaps arr is
|
| -// indeed an array, in which case the division result is the # of
|
| -// elements in the array. Otherwise, arr cannot possibly be an array,
|
| -// and we generate a compiler error to prevent the code from
|
| -// compiling.
|
| -//
|
| -// Since the size of bool is implementation-defined, we need to cast
|
| -// !(sizeof(a) & sizeof(*(a))) to size_t in order to ensure the final
|
| -// result has type size_t.
|
| -//
|
| -// This macro is not perfect as it wrongfully accepts certain
|
| -// pointers, namely where the pointer size is divisible by the pointee
|
| -// size. Since all our code has to go through a 32-bit compiler,
|
| -// where a pointer is 4 bytes, this means all pointers to a type whose
|
| -// size is 3 or greater than 4 will be (righteously) rejected.
|
| -#define ARRAYSIZE_UNSAFE(a) \
|
| - ((sizeof(a) / sizeof(*(a))) / \
|
| - static_cast<size_t>(!(sizeof(a) % sizeof(*(a))))) // NOLINT
|
| -
|
| -// TODO(bmeurer): For some reason, the NaCl toolchain cannot handle the correct
|
| -// definition of arraysize() below, so we have to use the unsafe version for
|
| -// now.
|
| -#define arraysize ARRAYSIZE_UNSAFE
|
| -
|
| -#else // V8_OS_NACL
|
| -
|
| // The arraysize(arr) macro returns the # of elements in an array arr.
|
| // The expression is a compile-time constant, and therefore can be
|
| // used in defining new arrays, for example. If you use arraysize on
|
| @@ -94,8 +45,6 @@ template <typename T, size_t N>
|
| char (&ArraySizeHelper(const T (&array)[N]))[N];
|
| #endif
|
|
|
| -#endif // V8_OS_NACL
|
| -
|
|
|
| // bit_cast<Dest,Source> is a template function that implements the
|
| // equivalent of "*reinterpret_cast<Dest*>(&source)". We need this in
|
|
|