Bug 1500616 - The ARM64 Ion exception should work on non-simulator builds. r=tcampbell

This commit is contained in:
Sean Stangl 2018-10-19 14:52:00 +03:00
parent 5ebe7949ae
commit 9b410bc831
2 changed files with 11 additions and 1 deletions

View File

@ -216,6 +216,15 @@ GetBuildConfiguration(JSContext* cx, unsigned argc, Value* vp)
return false;
}
#ifdef JS_CODEGEN_ARM64
value = BooleanValue(true);
#else
value = BooleanValue(false);
#endif
if (!JS_SetProperty(cx, info, "arm64", value)) {
return false;
}
#ifdef JS_SIMULATOR_ARM64
value = BooleanValue(true);
#else

View File

@ -12,7 +12,8 @@ function jitTogglesMatch(opts) {
// ARM64 does not yet have an Ion code generator, so return false if
// ion.enable is requested.
if (getBuildConfiguration()['arm64-simulator'] && opts['ion.enable'])
var conf = getBuildConfiguration();
if (conf['arm64'] && opts['ion.enable'])
return false;
return true;