autoland: changeset 313849:876a4319c262bff844529614b5343e634d0e3947

author	Sander Mathijs van Veen <smvv@kompiler.org>
	Mon, 12 Sep 2016 03:41:00 -0400
changeset 313849	876a4319c262bff844529614b5343e634d0e3947
parent 313848	4bdbbae12cb345de1d0dd52759a1824d031c7f91
child 313850	91be005ab8e60f5f1ade339a8543d4c580cbd494
push id	32264
push user	cbook@mozilla.com
push date	Wed, 14 Sep 2016 10:18:20 +0000
treeherder	autoland@b9c4a0402a0a [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	nbp
bugs	1292136
milestone	51.0a1
first release with	nightly linux32 29af101880db / 51.0a1 / 20160915030417 / files nightly linux64 29af101880db / 51.0a1 / 20160915030417 / files nightly mac 29af101880db / 51.0a1 / 20160915030417 / files nightly win32 29af101880db / 51.0a1 / 20160915030417 / files nightly win64 29af101880db / 51.0a1 / 20160915030417 / files
last release without	nightly linux32 82d0a583a9a3 / 51.0a1 / 20160914030200 / files nightly linux64 82d0a583a9a3 / 51.0a1 / 20160914030200 / files nightly mac 82d0a583a9a3 / 51.0a1 / 20160914030200 / files nightly win32 82d0a583a9a3 / 51.0a1 / 20160914030200 / files nightly win64 82d0a583a9a3 / 51.0a1 / 20160914030200 / files

--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -12031,18 +12031,20 @@ IonBuilder::loadUnboxedValue(MDefinition
         break;
 
       case JSVAL_TYPE_STRING:
         load = MLoadUnboxedString::New(alloc(), elements, index, elementsOffset);
         break;
 
       case JSVAL_TYPE_OBJECT: {
         MLoadUnboxedObjectOrNull::NullBehavior nullBehavior;
-        if (types->hasType(TypeSet::NullType()) || barrier != BarrierKind::NoBarrier)
+        if (types->hasType(TypeSet::NullType()))
             nullBehavior = MLoadUnboxedObjectOrNull::HandleNull;
+        else if (barrier != BarrierKind::NoBarrier)
+            nullBehavior = MLoadUnboxedObjectOrNull::BailOnNull;
         else
             nullBehavior = MLoadUnboxedObjectOrNull::NullNotPossible;
         load = MLoadUnboxedObjectOrNull::New(alloc(), elements, index, nullBehavior,
                                              elementsOffset);
         break;
       }
 
       default: