Bug 764923 - Don't check the OBJECT_FLAG_UNINLINEABLE flag when inlining in Ion. r=bhackett

js/src/ion/TypeOracle.cpp

@@ -511,12 +511,8 @@ TypeInferenceOracle::canEnterInlinedFunction(JSFunction *target)
     if (script->analysis()->usesScopeChain())
         return false;
 
-    // Create a watchdog on the type compile info, such as the compiled script
-    // would be discarded when type information of the inlined function will
-    // change.
-    if (types::TypeSet::HasObjectFlags(cx, target->getType(cx), types::OBJECT_FLAG_UNINLINEABLE))
-        return false;
-
+    // TI calls ObjectStateChange to trigger invalidation of the caller.
+    TypeSet::WatchObjectStateChange(cx, target->getType(cx));
     return true;
 }
 

js/src/jsinfer.h

@@ -275,7 +275,7 @@ enum {
     /* Whether any objects this represents are not typed arrays. */
     OBJECT_FLAG_NON_TYPED_ARRAY       = 0x00040000,
 
-    /* Whether any represented script is considered uninlineable. */
+    /* Whether any represented script is considered uninlineable in JM. */
     OBJECT_FLAG_UNINLINEABLE          = 0x00080000,
 
     /* Whether any objects have an equality hook. */