Bug 1032930 - Unbreak --disable-ion build after bug 1013172. r=h4writer
authorJan Beich <jbeich@vfemail.net>
Wed, 02 Jul 2014 09:34:00 -0400
changeset 213016 be915e8622effeab252a98656566510b6754ba54
parent 213015 650af90512e2ce63850ef289c303b071ecb2131f
child 213017 edcbee0050bcddb9cee62e61538d70f11f401a9d
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersh4writer
bugs1032930, 1013172
milestone33.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 1032930 - Unbreak --disable-ion build after bug 1013172. r=h4writer
js/src/vm/HelperThreads.cpp
--- a/js/src/vm/HelperThreads.cpp
+++ b/js/src/vm/HelperThreads.cpp
@@ -551,29 +551,33 @@ GlobalHelperThreadState::canStartAsmJSCo
         return false;
 
     return true;
 }
 
 static bool
 IonBuilderHasHigherPriority(jit::IonBuilder *first, jit::IonBuilder *second)
 {
+#ifdef JS_ION
     // This method can return whatever it wants, though it really ought to be a
     // total order. The ordering is allowed to race (change on the fly), however.
 
     // A lower optimization level indicates a higher priority.
     if (first->optimizationInfo().level() != second->optimizationInfo().level())
         return first->optimizationInfo().level() < second->optimizationInfo().level();
 
     // A script without an IonScript has precedence on one with.
     if (first->script()->hasIonScript() != second->script()->hasIonScript())
         return !first->script()->hasIonScript();
 
     // A higher useCount indicates a higher priority.
     return first->script()->getUseCount() > second->script()->getUseCount();
+#else
+    MOZ_ASSUME_UNREACHABLE("Cannot infer priority without Ion");
+#endif
 }
 
 bool
 GlobalHelperThreadState::canStartIonCompile()
 {
     return !ionWorklist().empty();
 }