Revision: 9052
Author: [email protected]
Date: Mon Aug 29 04:41:23 2011
Log: Small fix for STATIC_ASSERT.
Review URL: http://codereview.chromium.org/7776007
http://code.google.com/p/v8/source/detail?r=9052
Modified:
/branches/bleeding_edge/src/arm/code-stubs-arm.cc
/branches/bleeding_edge/src/checks.h
/branches/bleeding_edge/src/ia32/code-stubs-ia32.cc
/branches/bleeding_edge/src/mips/code-stubs-mips.cc
/branches/bleeding_edge/src/x64/code-stubs-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/code-stubs-arm.cc Fri Aug 26 06:03:30
2011
+++ /branches/bleeding_edge/src/arm/code-stubs-arm.cc Mon Aug 29 04:41:23
2011
@@ -4389,8 +4389,8 @@
// a sequential string or an external string.
// In the case of a sliced string its offset has to be taken into
account.
Label cons_string, check_encoding;
- STATIC_ASSERT((kConsStringTag < kExternalStringTag));
- STATIC_ASSERT((kSlicedStringTag > kExternalStringTag));
+ STATIC_ASSERT(kConsStringTag < kExternalStringTag);
+ STATIC_ASSERT(kSlicedStringTag > kExternalStringTag);
__ cmp(r1, Operand(kExternalStringTag));
__ b(lt, &cons_string);
__ b(eq, &runtime);
@@ -4857,8 +4857,8 @@
// Handle non-flat strings.
__ and_(result_, result_, Operand(kStringRepresentationMask));
- STATIC_ASSERT((kConsStringTag < kExternalStringTag));
- STATIC_ASSERT((kSlicedStringTag > kExternalStringTag));
+ STATIC_ASSERT(kConsStringTag < kExternalStringTag);
+ STATIC_ASSERT(kSlicedStringTag > kExternalStringTag);
__ cmp(result_, Operand(kExternalStringTag));
__ b(gt, &sliced_string);
__ b(eq, &call_runtime_);
=======================================
--- /branches/bleeding_edge/src/checks.h Fri Apr 1 04:54:04 2011
+++ /branches/bleeding_edge/src/checks.h Mon Aug 29 04:41:23 2011
@@ -251,9 +251,9 @@
// actually causes each use to introduce a new defined type with a
// name depending on the source line.
template <int> class StaticAssertionHelper { };
-#define
STATIC_CHECK(test) \
-
typedef \
-
StaticAssertionHelper<sizeof(StaticAssertion<static_cast<bool>(test)>)> \
+#define
STATIC_CHECK(test) \
+
typedef
\
+
StaticAssertionHelper<sizeof(StaticAssertion<static_cast<bool>((test))>)> \
SEMI_STATIC_JOIN(__StaticAssertTypedef__, __LINE__)
=======================================
--- /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Fri Aug 26 06:03:30
2011
+++ /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Mon Aug 29 04:41:23
2011
@@ -3396,8 +3396,8 @@
// a sequential string or an external string.
// In the case of a sliced string its offset has to be taken into
account.
Label cons_string, check_encoding;
- STATIC_ASSERT((kConsStringTag < kExternalStringTag));
- STATIC_ASSERT((kSlicedStringTag > kExternalStringTag));
+ STATIC_ASSERT(kConsStringTag < kExternalStringTag);
+ STATIC_ASSERT(kSlicedStringTag > kExternalStringTag);
__ cmp(Operand(ebx), Immediate(kExternalStringTag));
__ j(less, &cons_string);
__ j(equal, &runtime);
@@ -4872,8 +4872,8 @@
// Handle non-flat strings.
__ and_(result_, kStringRepresentationMask);
- STATIC_ASSERT((kConsStringTag < kExternalStringTag));
- STATIC_ASSERT((kSlicedStringTag > kExternalStringTag));
+ STATIC_ASSERT(kConsStringTag < kExternalStringTag);
+ STATIC_ASSERT(kSlicedStringTag > kExternalStringTag);
__ cmp(result_, kExternalStringTag);
__ j(greater, &sliced_string, Label::kNear);
__ j(equal, &call_runtime_);
=======================================
--- /branches/bleeding_edge/src/mips/code-stubs-mips.cc Mon Aug 29 02:36:58
2011
+++ /branches/bleeding_edge/src/mips/code-stubs-mips.cc Mon Aug 29 04:41:23
2011
@@ -4541,8 +4541,8 @@
// a sequential string or an external string.
// In the case of a sliced string its offset has to be taken into
account.
Label cons_string, check_encoding;
- STATIC_ASSERT((kConsStringTag < kExternalStringTag));
- STATIC_ASSERT((kSlicedStringTag > kExternalStringTag));
+ STATIC_ASSERT(kConsStringTag < kExternalStringTag);
+ STATIC_ASSERT(kSlicedStringTag > kExternalStringTag);
__ Branch(&cons_string, lt, at, Operand(kExternalStringTag));
__ Branch(&runtime, eq, at, Operand(kExternalStringTag));
@@ -5025,8 +5025,8 @@
// Handle non-flat strings.
__ And(result_, result_, Operand(kStringRepresentationMask));
- STATIC_ASSERT((kConsStringTag < kExternalStringTag));
- STATIC_ASSERT((kSlicedStringTag > kExternalStringTag));
+ STATIC_ASSERT(kConsStringTag < kExternalStringTag);
+ STATIC_ASSERT(kSlicedStringTag > kExternalStringTag);
__ Branch(&sliced_string, gt, result_, Operand(kExternalStringTag));
__ Branch(&call_runtime_, eq, result_, Operand(kExternalStringTag));
=======================================
--- /branches/bleeding_edge/src/x64/code-stubs-x64.cc Fri Aug 26 06:03:30
2011
+++ /branches/bleeding_edge/src/x64/code-stubs-x64.cc Mon Aug 29 04:41:23
2011
@@ -2470,8 +2470,8 @@
// a sequential string or an external string.
// In the case of a sliced string its offset has to be taken into
account.
Label cons_string, check_encoding;
- STATIC_ASSERT((kConsStringTag < kExternalStringTag));
- STATIC_ASSERT((kSlicedStringTag > kExternalStringTag));
+ STATIC_ASSERT(kConsStringTag < kExternalStringTag);
+ STATIC_ASSERT(kSlicedStringTag > kExternalStringTag);
__ cmpq(rbx, Immediate(kExternalStringTag));
__ j(less, &cons_string, Label::kNear);
__ j(equal, &runtime);
@@ -3903,8 +3903,8 @@
// Handle non-flat strings.
__ and_(result_, Immediate(kStringRepresentationMask));
- STATIC_ASSERT((kConsStringTag < kExternalStringTag));
- STATIC_ASSERT((kSlicedStringTag > kExternalStringTag));
+ STATIC_ASSERT(kConsStringTag < kExternalStringTag);
+ STATIC_ASSERT(kSlicedStringTag > kExternalStringTag);
__ cmpb(result_, Immediate(kExternalStringTag));
__ j(greater, &sliced_string);
__ j(equal, &call_runtime_);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
