Bug 1157761 - Fix a copy-pasto in vm/TypeInference.cpp. r=bhackett, a=sledru
authorBenjamin Bouvier <benj@benj.me>
Thu, 23 Apr 2015 17:58:29 +0200
changeset 267243 a752cbe8e5b1ebac30a27ab4881111e9b417422e
parent 267242 fd5e167468d2a96922f1e1f96bd662d4204b6553
child 267244 cf35a4698bd5eb5d3436dc301765c3f5bc41dac4
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhackett, sledru
bugs1157761
milestone39.0a2
Bug 1157761 - Fix a copy-pasto in vm/TypeInference.cpp. r=bhackett, a=sledru
js/src/vm/TypeInference.cpp
--- a/js/src/vm/TypeInference.cpp
+++ b/js/src/vm/TypeInference.cpp
@@ -899,17 +899,17 @@ TypeSet::intersectSets(TemporaryTypeSet*
             if (b->getObject(i))
                 res->addType(ObjectType(b->getObject(i)), alloc);
         }
         return res;
     }
 
     if (b->unknownObject()) {
         for (size_t i = 0; i < a->getObjectCount(); i++) {
-            if (b->getObject(i))
+            if (a->getObject(i))
                 res->addType(ObjectType(a->getObject(i)), alloc);
         }
         return res;
     }
 
     MOZ_ASSERT(!a->unknownObject() && !b->unknownObject());
 
     for (size_t i = 0; i < a->getObjectCount(); i++) {