Back out "Sink non-escaping PrimitiveBox onto deopt paths"

Summary:
Original commit changeset: 502d54a7199a

Original Phabricator Diff: D110384610

Mitigation for S683263

Reviewed By: alexmalyshev

Differential Revision: D110895060

fbshipit-source-id: a0e1934fa6ad3add1f6e5b4b5011801673dc076a

Author: Alisha Nayak

cinderx/Jit/compiler.cpp

@@ -20,7 +20,6 @@
 #include "cinderx/Jit/hir/printer.h"
 #include "cinderx/Jit/hir/refcount_insertion.h"
 #include "cinderx/Jit/hir/simplify.h"
-#include "cinderx/Jit/hir/sink_primitive_box.h"
 #include "cinderx/Jit/hir/ssa.h"
 #include "cinderx/Jit/hir/stats.h"
 #include "cinderx/Jit/jit_time_log.h"
@@ -108,7 +107,6 @@ void Compiler::runPasses(
       hir::BuiltinLoadMethodElimination{}, PassConfig::kBuiltinLoadMethodElim);
   runPassIf(hir::Simplify{}, PassConfig::kSimplify);
   runPassIf(hir::CleanCFG{}, PassConfig::kCleanCFG);
-  runPassIf(hir::SinkPrimitiveBox{}, PassConfig::kSinkPrimitiveBox);
   runPassIf(hir::DeadCodeElimination{}, PassConfig::kDeadCodeElim);
   runPassIf(hir::CleanCFG{}, PassConfig::kCleanCFG);
 
@@ -166,7 +164,6 @@ PassConfig createConfig() {
   set(hir_opts.insert_update_prev_instr, PassConfig::kInsertUpdatePrevInstr);
   set(hir_opts.phi_elim, PassConfig::kPhiElim);
   set(hir_opts.simplify, PassConfig::kSimplify);
-  set(hir_opts.sink_primitive_box, PassConfig::kSinkPrimitiveBox);
 
   return static_cast<PassConfig>(result);
 }

cinderx/Jit/compiler.h

@@ -38,7 +38,6 @@ enum PassConfig : uint64_t {
   kPhiElim = 1 << 7,
   kSimplify = 1 << 8,
   kInsertUpdatePrevInstr = 1 << 9,
-  kSinkPrimitiveBox = 1 << 10,
 
   // Run all the passes.
   kAll = ~uint64_t{0},

cinderx/Jit/config.h

@@ -43,7 +43,6 @@ struct HIROptimizations {
   bool insert_update_prev_instr{true};
   bool phi_elim{true};
   bool simplify{true};
-  bool sink_primitive_box{true};
 };
 
 // List of LIR optimization passes to run.

cinderx/Jit/hir/sink_primitive_box.cpp

@@ -564,11 +564,6 @@ FlagProcessor initFlagProcessor() {
       "CINDERX_JIT_PHI_ELIM");
   HIR_OPTIMIZATION_OPTION(
       "simplify", simplify, "cinderx-jit-simplify", "CINDERX_JIT_SIMPLIFY");
-  HIR_OPTIMIZATION_OPTION(
-      "sink primitive box",
-      sink_primitive_box,
-      "cinderx-jit-sink-primitive-box",
-      "CINDERX_JIT_SINK_PRIMITIVE_BOX");
 
   flag_processor.addOption(
       "cinderx-jit-simplify-iteration-limit",