autoland: changeset 371869:35368df4e011b0b1e7bef2936ad656d2cd4e17b1

author	Bill McCloskey <billm@mozilla.com>
	Wed, 19 Jul 2017 16:25:06 -0700
changeset 371869	35368df4e011b0b1e7bef2936ad656d2cd4e17b1
parent 371868	8853b5119f6881cad9693231dd03648b45eaee79
child 371870	fac66a370cf5f2ab1757e2714ca6901b5260aac9
push id	47611
push user	archaeopteryx@coole-files.de
push date	Sun, 30 Jul 2017 09:20:48 +0000
treeherder	autoland@8b577b152383 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bhackett
bugs	1384399
milestone	56.0a1
first release with	nightly linux32 8b577b152383 / 56.0a1 / 20170730100307 / files nightly linux64 8b577b152383 / 56.0a1 / 20170730100307 / files nightly mac 8b577b152383 / 56.0a1 / 20170730100307 / files nightly win32 8b577b152383 / 56.0a1 / 20170730100307 / files nightly win64 8b577b152383 / 56.0a1 / 20170730100307 / files
last release without	nightly linux32 5845151f1a2c / 56.0a1 / 20170728100358 / files nightly linux64 5845151f1a2c / 56.0a1 / 20170728100358 / files nightly mac 5845151f1a2c / 56.0a1 / 20170728100358 / files nightly win32 5845151f1a2c / 56.0a1 / 20170728100358 / files nightly win64 5845151f1a2c / 56.0a1 / 20170728100358 / files

--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -1495,10 +1495,10 @@ js::SetCooperativeYieldCallback(JSContex
 {
     cx->setYieldCallback(callback);
 }
 
 JS_FRIEND_API(bool)
 js::SystemZoneAvailable(JSContext* cx)
 {
     CooperatingContext& owner = cx->runtime()->gc.systemZoneGroup->ownerContext();
-    return owner.context() == cx || owner.context() == nullptr;
+    return owner.context() == nullptr;
 }