Reviewers: danno, Paul Lind, kisg, kilvadyb, dusmil,
Message:
PTAL.
Description:
MIPS: Unbreak big-endian build after r21774.
This fixes the STATIC_ASSERTS in the big-endian build.
BUG=
Please review this at https://codereview.chromium.org/338513002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+7, -2 lines):
M src/hydrogen-instructions.h
M src/objects.h
Index: src/hydrogen-instructions.h
diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h
index
f1720f444247d83635c84d00a99cf2457ee0022e..1cd0d9ae81f9000fb85e66c827ac89d5727712d3
100644
--- a/src/hydrogen-instructions.h
+++ b/src/hydrogen-instructions.h
@@ -6091,8 +6091,13 @@ class HObjectAccess V8_FINAL {
}
static HObjectAccess ForMapInstanceTypeAndBitField() {
+#if V8_TARGET_LITTLE_ENDIAN
STATIC_ASSERT((Map::kInstanceTypeOffset & 1) == 0);
STATIC_ASSERT(Map::kBitFieldOffset == Map::kInstanceTypeOffset + 1);
+#else
+ STATIC_ASSERT((Map::kBitFieldOffset & 1) == 0);
+ STATIC_ASSERT(Map::kInstanceTypeOffset == Map::kBitFieldOffset + 1);
+#endif
return HObjectAccess(kInobject,
Map::kInstanceTypeOffset,
Representation::UInteger16());
Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index
6813deebb20461304637671d4df395472006618c..c15da1d09bfee11a3492caefed84623ca052bfe2
100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -6710,15 +6710,15 @@ class Map: public HeapObject {
// of endianess.
static const int kInstanceTypeOffset = kInstanceAttributesOffset + 0;
static const int kBitFieldOffset = kInstanceAttributesOffset + 1;
+ STATIC_ASSERT(kInstanceTypeOffset == Internals::kMapInstanceTypeOffset);
#else
static const int kBitFieldOffset = kInstanceAttributesOffset + 0;
static const int kInstanceTypeOffset = kInstanceAttributesOffset + 1;
+ STATIC_ASSERT(kBitFieldOffset == Internals::kMapInstanceTypeOffset);
#endif
static const int kBitField2Offset = kInstanceAttributesOffset + 2;
static const int kUnusedPropertyFieldsOffset = kInstanceAttributesOffset
+ 3;
- STATIC_ASSERT(kInstanceTypeOffset == Internals::kMapInstanceTypeOffset);
-
// Bit positions for bit field.
static const int kHasNonInstancePrototype = 0;
static const int kIsHiddenPrototype = 1;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
