mozilla-central: changeset 228413:1938c82eaf522f4e9b03df197fbc88d022df9e2b

author	Jan de Mooij <jdemooij@mozilla.com>
	Tue, 10 Feb 2015 09:40:46 +0100
changeset 228413	1938c82eaf522f4e9b03df197fbc88d022df9e2b
parent 228412	96de29a78170a00037513000d4fc71e453cc701f
child 228414	bd213a5766714a5b6c93bf7a31fbf2bf000d4411
push id	28261
push user	ryanvm@gmail.com
push date	Tue, 10 Feb 2015 21:03:20 +0000
treeherder	mozilla-central@ee093ca70666 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	till
bugs	1128196
milestone	38.0a1
first release with	nightly linux32 ee093ca70666 / 38.0a1 / 20150211030228 / files nightly linux64 ee093ca70666 / 38.0a1 / 20150211030228 / files nightly mac ee093ca70666 / 38.0a1 / 20150211030228 / files nightly win32 ee093ca70666 / 38.0a1 / 20150211030228 / files nightly win64 ee093ca70666 / 38.0a1 / 20150211030228 / files
last release without	nightly linux32 2cb22c058add / 38.0a1 / 20150210030231 / files nightly linux64 2cb22c058add / 38.0a1 / 20150210030231 / files nightly mac 2cb22c058add / 38.0a1 / 20150210030231 / files nightly win32 2cb22c058add / 38.0a1 / 20150210030231 / files nightly win64 2cb22c058add / 38.0a1 / 20150210030231 / files

--- 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;