Bug 1128196 - Don't relazify scripts with a TypeScript. r=till
authorJan de Mooij <jdemooij@mozilla.com>
Tue, 10 Feb 2015 09:40:46 +0100
changeset 228413 1938c82eaf522f4e9b03df197fbc88d022df9e2b
parent 228412 96de29a78170a00037513000d4fc71e453cc701f
child 228414 bd213a5766714a5b6c93bf7a31fbf2bf000d4411
push id28261
push userryanvm@gmail.com
push dateTue, 10 Feb 2015 21:03:20 +0000
treeherdermozilla-central@ee093ca70666 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstill
bugs1128196
milestone38.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 1128196 - Don't relazify scripts with a TypeScript. r=till
js/src/jsscript.h
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -1366,17 +1366,17 @@ class JSScript : public js::gc::TenuredC
     uint8_t *baselineOrIonRawPointer() const {
         return baselineOrIonRaw;
     }
     static size_t offsetOfBaselineOrIonSkipArgCheck() {
         return offsetof(JSScript, baselineOrIonSkipArgCheck);
     }
 
     bool isRelazifiable() const {
-        return (selfHosted() || lazyScript) &&
+        return (selfHosted() || lazyScript) && !types_ &&
                !isGenerator() && !hasBaselineScript() && !hasAnyIonScript() &&
                !hasScriptCounts() && !doNotRelazify_;
     }
     void setLazyScript(js::LazyScript *lazy) {
         lazyScript = lazy;
     }
     js::LazyScript *maybeLazyScript() {
         return lazyScript;