Backed out changeset 533e61eb95d3 (bug 991234) for mochitest-2 bustage on Windows
authorWes Kocher <wkocher@mozilla.com>
Thu, 03 Apr 2014 13:52:53 -0700
changeset 176980 6519732bc27d94b76e013117331bbe3d1390caf8
parent 176979 90f74b01a4a59ba4b091fb1741958e08b4627198
child 176981 f4fcae008c8912fb38c94556719ca1fb33541a23
push id41883
push userkwierso@gmail.com
push dateThu, 03 Apr 2014 20:53:15 +0000
treeherdermozilla-inbound@6519732bc27d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs991234
milestone31.0a1
backs out533e61eb95d31ec3ba4000323c902a2363c8cd00
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
Backed out changeset 533e61eb95d3 (bug 991234) for mochitest-2 bustage on Windows
js/src/jit/IonBuilder.cpp
js/src/jit/TypeDescrSet.cpp
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -10135,18 +10135,18 @@ IonBuilder::lookupTypedObjectField(MDefi
     // Determine the type/offset of the field `name`, if any.
     int32_t offset;
     if (!objDescrs.fieldNamed(*this, NameToId(name), &offset,
                               fieldDescrs, fieldIndex))
         return false;
     if (fieldDescrs->empty())
         return true;
 
-    JS_ASSERT(offset >= 0);
-    *fieldOffset = offset;
+    *fieldOffset = int32_t(offset);
+    JS_ASSERT(*fieldOffset >= 0);
 
     return true;
 }
 
 MDefinition *
 IonBuilder::typeObjectForElementFromArrayStructType(MDefinition *typeObj)
 {
     MInstruction *elemType = MLoadFixedSlot::New(alloc(), typeObj, JS_DESCR_SLOT_ARRAY_ELEM_TYPE);
--- a/js/src/jit/TypeDescrSet.cpp
+++ b/js/src/jit/TypeDescrSet.cpp
@@ -320,17 +320,17 @@ TypeDescrSet::fieldNamed(IonBuilder &bui
                          int32_t *offset,
                          TypeDescrSet *out,
                          size_t *index)
 {
     JS_ASSERT(kind() == TypeDescr::Struct);
 
     // Initialize `*offset` and `*out` for the case where incompatible
     // or absent fields are found.
-    *offset = -1;
+    *offset = SIZE_MAX;
     *index = SIZE_MAX;
     *out = TypeDescrSet();
 
     // Remember offset of the first field.
     int32_t offset0;
     size_t index0;
     TypeDescrSetBuilder fieldTypes;
     {