Bug 914255 - Reduce the number of objects tracked in a TypeSet, r=bhackett
authorHannes Verschore <hv1989@gmail.com>
Sun, 03 Nov 2013 22:22:11 +0100
changeset 153301 8408cc15ce95583b42b2fc4d1977d89adee5052a
parent 153300 0d0cbac0197ea8e11d1df408fe2f3bd12a1d9229
child 153302 a833c2e9b95e438a729e53dda452701a16a2d532
push id25581
push usercbook@mozilla.com
push dateMon, 04 Nov 2013 12:33:37 +0000
treeherdermozilla-central@b4143e04bea1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhackett
bugs914255
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 914255 - Reduce the number of objects tracked in a TypeSet, r=bhackett
js/src/jsinfer.h
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.h
@@ -342,20 +342,20 @@ enum {
     TYPE_FLAG_LAZYARGS  = 0x40,
     TYPE_FLAG_ANYOBJECT = 0x80,
 
     /* Mask containing all primitives */
     TYPE_FLAG_PRIMITIVE = TYPE_FLAG_UNDEFINED | TYPE_FLAG_NULL | TYPE_FLAG_BOOLEAN |
                           TYPE_FLAG_INT32 | TYPE_FLAG_DOUBLE | TYPE_FLAG_STRING,
 
     /* Mask/shift for the number of objects in objectSet */
-    TYPE_FLAG_OBJECT_COUNT_MASK   = 0x1f00,
+    TYPE_FLAG_OBJECT_COUNT_LIMIT  = 7,
     TYPE_FLAG_OBJECT_COUNT_SHIFT  = 8,
-    TYPE_FLAG_OBJECT_COUNT_LIMIT  =
-        TYPE_FLAG_OBJECT_COUNT_MASK >> TYPE_FLAG_OBJECT_COUNT_SHIFT,
+    TYPE_FLAG_OBJECT_COUNT_MASK   = /* = 0x700 */
+        TYPE_FLAG_OBJECT_COUNT_LIMIT << TYPE_FLAG_OBJECT_COUNT_SHIFT,
 
     /* Whether the contents of this type set are totally unknown. */
     TYPE_FLAG_UNKNOWN             = 0x00002000,
 
     /* Mask of normal type flags on a type set. */
     TYPE_FLAG_BASE_MASK           = 0x000020ff,
 
     /*