Remove quotes from diagnostic template instead of stripping it from the constructed argument

Author: tarunprabhu

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -313,7 +313,7 @@ def warn_drv_potentially_misspelled_joined_argument : Warning<
   "joined argument treated as '%0'; did you mean '%1'?">, InGroup<UnknownArgument>;
 
 def err_drv_too_many_actions: Error<
-    "only one action option is allowed. Got '%0'">;
+    "only one action option is allowed. Got %0">;
 def err_drv_invalid_value : Error<"invalid value '%1' in '%0'">;
 def err_drv_invalid_int_value : Error<"invalid integral value '%1' in '%0'">;
 def err_drv_invalid_value_with_suggestion : Error<

flang/lib/Frontend/CompilerInvocation.cpp

@@ -605,8 +605,7 @@ static bool parseFrontendArgs(FrontendOptions &opts, llvm::opt::ArgList &args,
     }
     // The diagnostics engine will add single quotes around the argument to the
     // error message. Strip the leading and trailing quote from here.
-    diags.Report(clang::diag::err_drv_too_many_actions)
-        << buf.substr(1, buf.size() - 2);
+    diags.Report(clang::diag::err_drv_too_many_actions) << buf;
     return false;
   }