Bug 1541404 part 10 - Fix TypeMonitorResult to check for TypeScript instead of BaselineScript. r=tcampbell
authorJan de Mooij <jdemooij@mozilla.com>
Thu, 11 Apr 2019 13:22:10 +0000
changeset 469258 e4b6aa9c2fc4281c677a9f1eb35eb70500cbc64e
parent 469257 647b1f56c40383a0ed4e168a5218fdde6ee45382
child 469259 21ee37c5b888931751bc0a2429eb15ecdf74f57f
push id112776
push usershindli@mozilla.com
push dateFri, 12 Apr 2019 16:20:17 +0000
treeherdermozilla-inbound@b4501ced5619 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstcampbell
bugs1541404
milestone68.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 1541404 part 10 - Fix TypeMonitorResult to check for TypeScript instead of BaselineScript. r=tcampbell The BaselineScript used to contain the bytecode type map but that's now stored in TypeScript. Differential Revision: https://phabricator.services.mozilla.com/D27038
js/src/vm/TypeInference.cpp
--- a/js/src/vm/TypeInference.cpp
+++ b/js/src/vm/TypeInference.cpp
@@ -3470,17 +3470,17 @@ void js::TypeMonitorResult(JSContext* cx
 void js::TypeMonitorResult(JSContext* cx, JSScript* script, jsbytecode* pc,
                            const js::Value& rval) {
   // Allow the non-TYPESET scenario to simplify stubs used in compound
   // opcodes.
   if (!(CodeSpec[*pc].format & JOF_TYPESET)) {
     return;
   }
 
-  if (!script->hasBaselineScript()) {
+  if (!script->types()) {
     return;
   }
 
   TypeMonitorResult(cx, script, pc, TypeSet::GetValueType(rval));
 }
 
 /////////////////////////////////////////////////////////////////////
 // TypeScript