From: Xinliang David Li <davidxl@google.com>
Date: Mon, 23 Nov 2015 05:41:05 +0000 (+0000)
Subject: Revert r253846 (build bot failure))
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6277fb58d70f6411aaa3e821ff0034991cf03c83;p=clang

Revert r253846 (build bot failure))

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253851 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 89a8d90b7a..acf2cbcf1c 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2794,8 +2794,6 @@ static bool shouldUseFramePointer(const ArgList &Args,
   if (Arg *A = Args.getLastArg(options::OPT_fno_omit_frame_pointer,
                                options::OPT_fomit_frame_pointer))
     return A->getOption().matches(options::OPT_fno_omit_frame_pointer);
-  if (Args.hasArg(options::OPT_pg))
-    return true;
 
   return shouldUseFramePointerForTarget(Args, Triple);
 }
@@ -2805,8 +2803,6 @@ static bool shouldUseLeafFramePointer(const ArgList &Args,
   if (Arg *A = Args.getLastArg(options::OPT_mno_omit_leaf_frame_pointer,
                                options::OPT_momit_leaf_frame_pointer))
     return A->getOption().matches(options::OPT_mno_omit_leaf_frame_pointer);
-  if (Args.hasArg(options::OPT_pg))
-    return true;
 
   if (Triple.isPS4CPU())
     return false;
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 26f93895a4..91917cf510 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -453,8 +453,7 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
   Opts.CXXCtorDtorAliases = Args.hasArg(OPT_mconstructor_aliases);
   Opts.CodeModel = getCodeModel(Args, Diags);
   Opts.DebugPass = Args.getLastArgValue(OPT_mdebug_pass);
-  Opts.DisableFPElim =
-      (Args.hasArg(OPT_mdisable_fp_elim) || Args.hasArg(OPT_pg));
+  Opts.DisableFPElim = Args.hasArg(OPT_mdisable_fp_elim);
   Opts.DisableFree = Args.hasArg(OPT_disable_free);
   Opts.DisableTailCalls = Args.hasArg(OPT_mdisable_tail_calls);
   Opts.FloatABI = Args.getLastArgValue(OPT_mfloat_abi);
diff --git a/test/CodeGen/x86_64-profiling-keep-fp.c b/test/CodeGen/x86_64-profiling-keep-fp.c
deleted file mode 100644
index e56ac953a6..0000000000
--- a/test/CodeGen/x86_64-profiling-keep-fp.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-unknown -O3 -pg -S -o - %s | \
-// RUN:   FileCheck %s
-// RUN: %clang_cc1 -triple x86_64-unknown-unknown -O3 -momit-leaf-frame-pointer -pg -S -o - %s | \
-// RUN:   FileCheck %s
-
-// Test that the frame pointer is kept when compiling with
-// profiling.
-
-//CHECK: pushq %rbp
-int main(void)
-{
-  return 0;
-}