Import Cobalt 6.14838
Change-Id: I49864fe26f7f6fca3777d185823aa31251e8ae57
diff --git a/src/third_party/mozjs/js/src/jit/Ion.cpp b/src/third_party/mozjs/js/src/jit/Ion.cpp
index 66cce66..2f00859 100644
--- a/src/third_party/mozjs/js/src/jit/Ion.cpp
+++ b/src/third_party/mozjs/js/src/jit/Ion.cpp
@@ -2031,7 +2031,8 @@
IonExecStatus
jit::Cannon(JSContext *cx, RunState &state)
{
- IonScript *ion = state.script()->ionScript();
+ JSScript *script = state.script();
+ IonScript *ion = script->ionScript();
EnterJitData data(cx);
data.jitcode = ion->method()->raw();
diff --git a/src/third_party/mozjs/js/src/jit/arm/Architecture-arm.cpp b/src/third_party/mozjs/js/src/jit/arm/Architecture-arm.cpp
index a5b04e8..770fd12 100644
--- a/src/third_party/mozjs/js/src/jit/arm/Architecture-arm.cpp
+++ b/src/third_party/mozjs/js/src/jit/arm/Architecture-arm.cpp
@@ -99,6 +99,13 @@
return flags;
#endif
+#if defined(__GNUC__) && defined(__VFP_FP__)
+ // Mimic behavior of JSC::isVFPPresent().
+ // On ARMv6, lack of this feature will prevent the ion jit path.
+ flags |= HWCAP_VFP;
+ return flags;
+#endif
+
return false;
}
diff --git a/src/third_party/mozjs/mozjs.gyp b/src/third_party/mozjs/mozjs.gyp
index 8895e64..3de7f79 100644
--- a/src/third_party/mozjs/mozjs.gyp
+++ b/src/third_party/mozjs/mozjs.gyp
@@ -88,6 +88,11 @@
'JS_DEBUG',
],
}],
+ [ 'cobalt_config != "gold"', {
+ 'defines': [
+ 'JS_TRACE_LOGGING=1',
+ ],
+ }],
],
},
'targets': [
