Revision: 18561
Author: [email protected]
Date: Mon Jan 13 11:34:55 2014 UTC
Log: Merged r18284 into 3.23 branch.
Increase number of available major keys.
[email protected]
BUG=
Review URL: https://codereview.chromium.org/136513002
http://code.google.com/p/v8/source/detail?r=18561
Modified:
/branches/3.23/src/code-stubs.h
/branches/3.23/src/objects.h
/branches/3.23/src/version.cc
=======================================
--- /branches/3.23/src/code-stubs.h Fri Jan 10 13:13:22 2014 UTC
+++ /branches/3.23/src/code-stubs.h Mon Jan 13 11:34:55 2014 UTC
@@ -246,6 +246,7 @@
MajorKeyBits::encode(MajorKey());
}
+ STATIC_ASSERT(NUMBER_OF_IDS < (1 << kStubMajorKeyBits));
class MajorKeyBits: public BitField<uint32_t, 0, kStubMajorKeyBits> {};
class MinorKeyBits: public BitField<uint32_t,
kStubMajorKeyBits, kStubMinorKeyBits> {}; // NOLINT
=======================================
--- /branches/3.23/src/objects.h Fri Jan 10 13:13:22 2014 UTC
+++ /branches/3.23/src/objects.h Mon Jan 13 11:34:55 2014 UTC
@@ -311,7 +311,7 @@
// Instance size sentinel for objects of variable size.
const int kVariableSizeSentinel = 0;
-const int kStubMajorKeyBits = 6;
+const int kStubMajorKeyBits = 7;
const int kStubMinorKeyBits = kBitsPerInt - kSmiTagSize -
kStubMajorKeyBits;
// All Maps have a field instance_type containing a InstanceType.
@@ -5487,7 +5487,7 @@
static const int kStubMajorKeyFirstBit = kIsCrankshaftedBit + 1;
static const int kSafepointTableOffsetFirstBit =
kStubMajorKeyFirstBit + kStubMajorKeyBits;
- static const int kSafepointTableOffsetBitCount = 25;
+ static const int kSafepointTableOffsetBitCount = 24;
STATIC_ASSERT(kStubMajorKeyFirstBit + kStubMajorKeyBits <= 32);
STATIC_ASSERT(kSafepointTableOffsetFirstBit +
=======================================
--- /branches/3.23/src/version.cc Fri Jan 10 13:13:22 2014 UTC
+++ /branches/3.23/src/version.cc Mon Jan 13 11:34:55 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 23
#define BUILD_NUMBER 17
-#define PATCH_LEVEL 5
+#define PATCH_LEVEL 6
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
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/groups/opt_out.
