mozilla-central: changeset 128489:e438d532b4af99ab3c358a24f153355dc2db8d67

author	Sean Stangl <sstangl@mozilla.com>
	Thu, 11 Apr 2013 11:39:59 -0700
changeset 128489	e438d532b4af99ab3c358a24f153355dc2db8d67
parent 128488	83b8038839f1bda4c5f42afe54b63469a61eeb6f
child 128490	f556245d6da1f6edf50fbbea4180d2d22d1a3a63
push id	24529
push user	ryanvm@gmail.com
push date	Fri, 12 Apr 2013 11:51:36 +0000
treeherder	mozilla-central@5bc732a49eae [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	luke
bugs	858783
milestone	23.0a1
first release with	nightly linux32 24a6b5ed51e3 / 23.0a1 / 20130413030927 / files nightly linux64 24a6b5ed51e3 / 23.0a1 / 20130413030927 / files nightly mac 24a6b5ed51e3 / 23.0a1 / 20130413030927 / files nightly win32 24a6b5ed51e3 / 23.0a1 / 20130413030927 / files nightly win64 24a6b5ed51e3 / 23.0a1 / 20130413030927 / files
last release without	nightly linux32 7b8ed29c6bc0 / 23.0a1 / 20130412030828 / files nightly linux64 7b8ed29c6bc0 / 23.0a1 / 20130412030828 / files nightly mac 7b8ed29c6bc0 / 23.0a1 / 20130412030828 / files nightly win32 7b8ed29c6bc0 / 23.0a1 / 20130412030828 / files nightly win64 7b8ed29c6bc0 / 23.0a1 / 20130412030828 / files

--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -5524,17 +5524,18 @@ js::CompileAsmJS(JSContext *cx, TokenStr
 
 JSBool
 js::IsAsmJSCompilationAvailable(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
 #ifdef JS_ASMJS
     bool available = JSC::MacroAssembler().supportsFloatingPoint() &&
-                     !cx->compartment->debugMode();
+                     !cx->compartment->debugMode() &&
+                     cx->hasOption(JSOPTION_ASMJS);
 #else
     bool available = false;
 #endif
 
     args.rval().set(BooleanValue(available));
     return true;
 }