From c2bf338d35cfccc64451b0921028c2353e8c7015 Mon Sep 17 00:00:00 2001
From: Chad Rosier <mcrosier@apple.com>
Date: Fri, 4 Nov 2011 19:28:44 +0000
Subject: [PATCH] [driver] Don't blindly accept all -g options. rdar://10383444

llvm-svn: 143732
---
 clang/lib/Driver/Tools.cpp        | 20 ++++++++++++++++++--
 clang/test/Driver/debug-options.c | 19 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 clang/test/Driver/debug-options.c

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 4f84d0a0dd21..8c0382fbf3a2 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -1455,8 +1455,24 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // wrong.
   Args.ClaimAllArgs(options::OPT_g_Group);
   if (Arg *A = Args.getLastArg(options::OPT_g_Group))
-    if (!A->getOption().matches(options::OPT_g0))
-      CmdArgs.push_back("-g");
+    if (!A->getOption().matches(options::OPT_g0)) {
+      StringRef ArgString = A->getAsString(Args);
+      bool Valid_g = llvm::StringSwitch<bool>(ArgString)
+        .Case("-g", true)
+        .Case("-g3", true)
+        .Case("-gdwarf-2", true)
+        .Case("-gstabs", true)
+        .Case("-gstabs+", true)
+        .Case("-gstabs1", true)
+        .Case("-gstabs2", true)
+        .Case("-gfull", true)
+        .Case("-gused", true)
+        .Default(false);
+      if (Valid_g)
+        CmdArgs.push_back("-g");
+      else
+        D.Diag(diag::warn_drv_clang_unsupported) << ArgString;
+    }
 
   Args.AddAllArgs(CmdArgs, options::OPT_ffunction_sections);
   Args.AddAllArgs(CmdArgs, options::OPT_fdata_sections);
diff --git a/clang/test/Driver/debug-options.c b/clang/test/Driver/debug-options.c
new file mode 100644
index 000000000000..867251971d26
--- /dev/null
+++ b/clang/test/Driver/debug-options.c
@@ -0,0 +1,19 @@
+// Check to make sure clang is somewhat picky about -g options.
+// rdar://10383444
+
+// RUN: %clang -### -c -g %s 2>&1 | FileCheck -check-prefix=G %s
+// RUN: %clang -### -c -g3 %s 2>&1 | FileCheck -check-prefix=G3 %s
+// RUN: %clang -### -c -ganything %s 2>&1 | FileCheck -check-prefix=GANY %s
+// RUN: %clang -### -c -gfoo %s 2>&1 | FileCheck -check-prefix=GFOO %s
+//
+// G: "-cc1"
+// G: "-g"
+//
+// G3: "-cc1"
+// G3: "-g"
+//
+// GANY: "-cc1"
+// GANY-NOT: "-g"
+//
+// GFOO: "-cc1"
+// GFOO-NOT: "-g"