From 795767fefa0bdf08166d88af2a654fb530050eb5 Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Wed, 1 Jul 2020 21:46:21 +0000
Subject: [PATCH] Bug 1649201 - Remove unused bailout kinds. r=jandem

Differential Revision: https://phabricator.services.mozilla.com/D81567
---
 js/src/jit/BaselineBailouts.cpp |  2 --
 js/src/jit/IonTypes.h           | 14 --------------
 2 files changed, 16 deletions(-)

diff --git a/js/src/jit/BaselineBailouts.cpp b/js/src/jit/BaselineBailouts.cpp
index 6d5697413288..d725cd4e3a17 100644
--- a/js/src/jit/BaselineBailouts.cpp
+++ b/js/src/jit/BaselineBailouts.cpp
@@ -1978,7 +1978,6 @@ bool jit::FinishBailoutToBaseline(BaselineBailoutInfo* bailoutInfoArg) {
     case BailoutKind::DuringVMCall:
     case BailoutKind::TooManyArguments:
     case BailoutKind::DynamicNameNotFound:
-    case BailoutKind::StringArgumentsEval:
     case BailoutKind::Overflow:
     case BailoutKind::Round:
     case BailoutKind::NonPrimitiveInput:
@@ -1987,7 +1986,6 @@ bool jit::FinishBailoutToBaseline(BaselineBailoutInfo* bailoutInfoArg) {
     case BailoutKind::TypeBarrierV:
     case BailoutKind::ValueGuard:
     case BailoutKind::NullOrUndefinedGuard:
-    case BailoutKind::MonitorTypes:
     case BailoutKind::Hole:
     case BailoutKind::NoDenseElementsGuard:
     case BailoutKind::NegativeIndex:
diff --git a/js/src/jit/IonTypes.h b/js/src/jit/IonTypes.h
index cef72bb16e2b..b30f71e45f75 100644
--- a/js/src/jit/IonTypes.h
+++ b/js/src/jit/IonTypes.h
@@ -76,9 +76,6 @@ enum class BailoutKind : uint8_t {
   // Dynamic scope chain lookup produced |undefined|
   DynamicNameNotFound,
 
-  // Input string contains 'arguments' or 'eval'
-  StringArgumentsEval,
-
   // Bailout on overflow, but don't immediately invalidate.
   // Used for abs, sub and LoadUnboxedScalar (when loading a uint32 that
   // doesn't fit in an int32).
@@ -100,8 +97,6 @@ enum class BailoutKind : uint8_t {
   TypeBarrierO,
   // We tripped a type barrier (value was not in the expected TypeSet)
   TypeBarrierV,
-  // We tripped a type monitor (wrote an unexpected type in a property)
-  MonitorTypes,
 
   // We hit a hole in an array.
   Hole,
@@ -112,9 +107,6 @@ enum class BailoutKind : uint8_t {
   // Array access with negative index
   NegativeIndex,
 
-  // Array access with non integer index
-  NonIntegerIndex,
-
   // Pretty specific case:
   //  - need a type barrier on a property write
   //  - all but one of the observed types have property types that reflect
@@ -201,8 +193,6 @@ inline const char* BailoutKindString(BailoutKind kind) {
       return "BailoutKind::TooManyArguments";
     case BailoutKind::DynamicNameNotFound:
       return "BailoutKind::DynamicNameNotFound";
-    case BailoutKind::StringArgumentsEval:
-      return "BailoutKind::StringArgumentsEval";
     case BailoutKind::Overflow:
       return "BailoutKind::Overflow";
     case BailoutKind::Round:
@@ -215,16 +205,12 @@ inline const char* BailoutKindString(BailoutKind kind) {
       return "BailoutKind::TypeBarrierO";
     case BailoutKind::TypeBarrierV:
       return "BailoutKind::TypeBarrierV";
-    case BailoutKind::MonitorTypes:
-      return "BailoutKind::MonitorTypes";
     case BailoutKind::Hole:
       return "BailoutKind::Hole";
     case BailoutKind::NoDenseElementsGuard:
       return "BailoutKind::NoDenseElementsGuard";
     case BailoutKind::NegativeIndex:
       return "BailoutKind::NegativeIndex";
-    case BailoutKind::NonIntegerIndex:
-      return "BailoutKind::NonIntegerIndex";
     case BailoutKind::ObjectIdentityOrTypeGuard:
       return "BailoutKind::ObjectIdentityOrTypeGuard";
     case BailoutKind::SpecificAtomGuard: