git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138610 91177308-0d34-0410...

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 33e11fb84934f62139e5fd241bdb6f46ca9d0d9b..48aeb5be7466c7b6c334981ccec93d8f57bee336 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1777,8 +1777,18 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // -fno-delayed-template-parsing is default.
   if (Args.hasFlag(options::OPT_fdelayed_template_parsing,
                    options::OPT_fno_delayed_template_parsing,
-                   false))
-    CmdArgs.push_back("-fdelayed-template-parsing");
+                   false)) {
+    if (Args.hasArg(options::OPT_fdelayed_template_parsing)) {
+      StringRef Force = Args.getLastArgValue(options::OPT_fdelayed_template_parsing, "");
+      if (Force == "-force")
+        CmdArgs.push_back("-fdelayed-template-parsing-force");
+      else
+        CmdArgs.push_back("-fdelayed-template-parsing");
+    }
+    else
+      CmdArgs.push_back("-fdelayed-template-parsing");
+  }
+
 
   // -fgnu-keywords default varies depending on language; only pass if
   // specified.