From 5bfc8edb8b7a18d7c5b87ff0dafb84867e811b37 Mon Sep 17 00:00:00 2001
From: Jessica Paquette <jpaquette@apple.com>
Date: Thu, 28 Jun 2018 17:05:57 +0000
Subject: [PATCH] [MachineOutliner] Never add the outliner in -O0

We shouldn't add the outliner when compiling at -O0 even if
-enable-machine-outliner is passed in. This makes sure that we
don't add it in this case.

This also updates machine-outliner-flags to reflect the change
and improves the comment describing what that test does.

llvm-svn: 335879
---
 lib/CodeGen/TargetPassConfig.cpp              |  3 ++-
 .../CodeGen/AArch64/machine-outliner-flags.ll | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/CodeGen/TargetPassConfig.cpp b/lib/CodeGen/TargetPassConfig.cpp
index 20771eef620..74cd56b40a7 100644
--- a/lib/CodeGen/TargetPassConfig.cpp
+++ b/lib/CodeGen/TargetPassConfig.cpp
@@ -914,7 +914,8 @@ void TargetPassConfig::addMachinePasses() {
   addPass(&XRayInstrumentationID, false);
   addPass(&PatchableFunctionID, false);
 
-  if (EnableMachineOutliner == AlwaysOutline)
+  if (getOptLevel() != CodeGenOpt::None &&
+      EnableMachineOutliner == AlwaysOutline)
     addPass(createMachineOutlinerPass());
 
   // Add passes that directly emit MI after all other MI passes.
diff --git a/test/CodeGen/AArch64/machine-outliner-flags.ll b/test/CodeGen/AArch64/machine-outliner-flags.ll
index 0f232c8a1f0..b3eec9bb2e6 100644
--- a/test/CodeGen/AArch64/machine-outliner-flags.ll
+++ b/test/CodeGen/AArch64/machine-outliner-flags.ll
@@ -14,15 +14,27 @@
 ; RUN: -mtriple arm64---- -o /dev/null 2>&1 \
 ; RUN: | FileCheck %s -check-prefix=NOT-ADDED
 
-; Make sure that the outliner flags all work properly. If we specify
-; -enable-machine-outliner with always or no argument, it should be added to the
-; pass pipeline. If we specify it with never, or don't pass the flag,
-; then we shouldn't add it.
+; RUN: llc %s -O=0 -debug-pass=Structure -verify-machineinstrs \
+; RUN: -mtriple arm64---- -o /dev/null 2>&1 \
+; RUN: | FileCheck %s -check-prefix=OPTNONE
+
+; Make sure that the outliner is added to the pass pipeline only when the
+; appropriate flags/settings are set. Make sure it isn't added otherwise.
+;
+; Cases where it should be added:
+;  * -enable-machine-outliner
+;  * -enable-machine-outliner=always
+;
+; Cases where it should not be added:
+;  * -enable-machine-outliner=never
+;  * -O0 or equivalent
+;  * -enable-machine-outliner is not passed
 
 ; ALWAYS: Machine Outliner
 ; ENABLE: Machine Outliner
 ; NEVER-NOT: Machine Outliner
 ; NOT-ADDED-NOT: Machine Outliner
+; OPTNONE-NOT: Machine Outliner
 
 define void @foo() {
   ret void;