EASY: remove unused compiler settings

tmikov · facebook-github-bot · commit c6d5bb0cfc64 · 2020-11-04T11:49:27.000-08:00
Summary: .

Reviewed By: neildhar, avp

Differential Revision: D24731446

fbshipit-source-id: 4b539b9e9f9eac8be8f86104b3bff64e494a890b
diff --git a/include/hermes/AST/Context.h b/include/hermes/AST/Context.h
@@ -41,30 +41,7 @@ struct CodeGenerationSettings {
   bool instrumentIR{false};
 };
 
-struct OutliningSettings {
-  /// If true, place outlined functions near one of their callers. Otherwise,
-  /// put them all together at the end of the module.
-  bool placeNearCaller{true};
-  /// Maximum number of outlining rounds.
-  unsigned maxRounds{1};
-  /// Minimum length (number of instructions) to consider outlining.
-  unsigned minLength{64};
-  /// Minimum number of parameters for outlined functions.
-  unsigned minParameters{0};
-  /// Maximum number of parameters for outlined functions.
-  unsigned maxParameters{5};
-};
-
 struct OptimizationSettings {
-  /// Enable constant property optimization
-  bool constantPropertyOptimizations{false};
-
-  /// Enable unused method optimization
-  bool uncalledMethodOptimizations{false};
-
-  /// Enable cross-module closure analysis (if CLA is enabled)
-  BundlerKind crossModuleClosureAnalysis{BundlerKind::none};
-
   /// Enable aggressive non-strict mode optimizations. These optimizations
   /// assume that:
   ///   - function arguments are never modified indirectly
@@ -77,9 +54,6 @@ struct OptimizationSettings {
   /// Enable IR outlining.
   bool outlining{false};
 
-  /// Specific settings for the outliner.
-  OutliningSettings outliningSettings;
-
   /// Reuse property cache entries for same property name.
   bool reusePropCache{true};
 
diff --git a/lib/CompilerDriver/CompilerDriver.cpp b/lib/CompilerDriver/CompilerDriver.cpp
@@ -403,29 +403,6 @@ static opt<int> MaxDiagnosticWidth(
     llvh::cl::init(0),
     cat(CompilerCategory));
 
-static opt<bool> EnableCPO(
-    "enable-cpo",
-    desc("Enable constant property optimizations"),
-    init(false),
-    cat(CompilerCategory));
-
-static opt<bool> EnableUMO(
-    "enable-umo",
-    desc("Enable uncalled method optimizations"),
-    init(false),
-    cat(CompilerCategory));
-
-static opt<BundlerKind> EnableCrossModuleCLA(
-    "enable-xm",
-    desc("Enable cross module CLA, if doing CLA"),
-    cl::values(
-        clEnumValN(BundlerKind::none, "none", "no cross-module optimization"),
-        clEnumValN(
-            BundlerKind::metromin,
-            "metromin",
-            "Minified metro bundling")),
-    cat(CompilerCategory));
-
 static opt<bool> CommonJS(
     "commonjs",
     desc("Use CommonJS modules"),
@@ -507,41 +484,6 @@ static CLFlag EnableTDZ(
     "Enable TDZ checks for let/const",
     CompilerCategory);
 
-static opt<bool> OutliningPlaceNearCaller(
-    "outline-near-caller",
-    init(OutliningSettings{}.placeNearCaller),
-    desc("Place outlined functions near callers instead of at the end"),
-    Hidden,
-    cat(CompilerCategory));
-
-static opt<unsigned> OutliningMaxRounds(
-    "outline-max-rounds",
-    init(OutliningSettings{}.maxRounds),
-    desc("Maximum number of outlining rounds to perform"),
-    Hidden,
-    cat(CompilerCategory));
-
-static opt<unsigned> OutliningMinLength(
-    "outline-min-length",
-    init(OutliningSettings{}.minLength),
-    desc("Minimum number of instructions to consider outlining"),
-    Hidden,
-    cat(CompilerCategory));
-
-static opt<unsigned> OutliningMinParameters(
-    "outline-min-params",
-    init(OutliningSettings{}.minParameters),
-    desc("Minimum number of parameters in outlined functions"),
-    Hidden,
-    cat(CompilerCategory));
-
-static opt<unsigned> OutliningMaxParameters(
-    "outline-max-params",
-    init(OutliningSettings{}.maxParameters),
-    desc("Maximum number of parameters in outlined functions"),
-    Hidden,
-    cat(CompilerCategory));
-
 static CLFlag DirectEvalWarning(
     'W',
     "direct-eval",
@@ -988,10 +930,6 @@ std::shared_ptr<Context> createContext(
   codeGenOpts.instrumentIR = cl::InstrumentIR;
 
   OptimizationSettings optimizationOpts;
-  optimizationOpts.constantPropertyOptimizations = cl::EnableCPO;
-  optimizationOpts.uncalledMethodOptimizations = cl::EnableUMO;
-  optimizationOpts.crossModuleClosureAnalysis =
-      cl::EnableCrossModuleCLA.getValue();
 
   // Enable aggressiveNonStrictModeOptimizations if the target is HBC.
   optimizationOpts.aggressiveNonStrictModeOptimizations =
@@ -1002,13 +940,6 @@ std::shared_ptr<Context> createContext(
   optimizationOpts.outlining =
       cl::OptimizationLevel != cl::OptLevel::O0 && cl::Outline;
 
-  optimizationOpts.outliningSettings.placeNearCaller =
-      cl::OutliningPlaceNearCaller;
-  optimizationOpts.outliningSettings.maxRounds = cl::OutliningMaxRounds;
-  optimizationOpts.outliningSettings.minLength = cl::OutliningMinLength;
-  optimizationOpts.outliningSettings.minParameters = cl::OutliningMinParameters;
-  optimizationOpts.outliningSettings.maxParameters = cl::OutliningMaxParameters;
-
   optimizationOpts.reusePropCache = cl::ReusePropCache;
 
   // When the setting is auto-detect, we will set the correct value after
