Revert "[MachineOutliner] Add always and never options to -enable-machine-outliner"

I accidentally committed this instead of D48683 because I haven't had coffee
yet.

llvm-svn: 335883

1 files changed, 4 insertions, 12 deletions

diff --git a/llvm/lib/CodeGen/TargetPassConfig.cpp b/llvm/lib/CodeGen/TargetPassConfig.cpp
index 20771eef620..8c5bdde888e 100644
--- a/llvm/lib/CodeGen/TargetPassConfig.cpp
+++ b/llvm/lib/CodeGen/TargetPassConfig.cpp
@@ -111,17 +111,9 @@ static cl::opt<bool> VerifyMachineCode("verify-machineinstrs", cl::Hidden,
     cl::desc("Verify generated machine code"),
     cl::init(false),
     cl::ZeroOrMore);
-enum RunOutliner { AlwaysOutline, NeverOutline };
-// Enable or disable the MachineOutliner.
-static cl::opt<RunOutliner> EnableMachineOutliner(
-    "enable-machine-outliner", cl::desc("Enable the machine outliner"),
-    cl::Hidden, cl::ValueOptional, cl::init(NeverOutline),
-    cl::values(clEnumValN(AlwaysOutline, "always",
-                          "Run on all functions guaranteed to be beneficial "
-                          "(pass -enable-linkonceodr-outlining for more)"),
-               clEnumValN(NeverOutline, "never", "Disable all outlining"),
-               // Sentinel value for unspecified option.
-               clEnumValN(AlwaysOutline, "", "")));
+static cl::opt<bool> EnableMachineOutliner("enable-machine-outliner",
+    cl::Hidden,
+    cl::desc("Enable machine outliner"));
 // Enable or disable FastISel. Both options are needed, because
 // FastISel is enabled by default with -fast, and we wish to be
 // able to enable or disable fast-isel independently from -O0.
@@ -914,7 +906,7 @@ void TargetPassConfig::addMachinePasses() {
   addPass(&XRayInstrumentationID, false);
   addPass(&PatchableFunctionID, false);
 
-  if (EnableMachineOutliner == AlwaysOutline)
+  if (EnableMachineOutliner)
     addPass(createMachineOutlinerPass());
 
   // Add passes that directly emit MI after all other MI passes.