Bug 991234 -- Squelch warning r=h4writer
☠☠ backed out by 6519732bc27d ☠ ☠
authorNicholas D. Matsakis <nmatsakis@mozilla.com>
Thu, 03 Apr 2014 05:45:39 -0400
changeset 176928 533e61eb95d31ec3ba4000323c902a2363c8cd00
parent 176927 198eb23cba8f0d72053de6ebab30e5a45115c0fd
child 176929 3bd335914852b71acefb2396c2c80600d437b4ea
push id41879
push usernmatsakis@mozilla.com
push dateThu, 03 Apr 2014 18:54:34 +0000
treeherdermozilla-inbound@2daa537b62e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersh4writer
bugs991234
milestone31.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 991234 -- Squelch warning r=h4writer
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;
 
-    *fieldOffset = int32_t(offset);
-    JS_ASSERT(*fieldOffset >= 0);
+    JS_ASSERT(offset >= 0);
+    *fieldOffset = offset;
 
     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 = SIZE_MAX;
+    *offset = -1;
     *index = SIZE_MAX;
     *out = TypeDescrSet();
 
     // Remember offset of the first field.
     int32_t offset0;
     size_t index0;
     TypeDescrSetBuilder fieldTypes;
     {