[llvm-branch-commits] [cfe-branch] r355677 - Merging r355489:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Mar  8 01:27:18 2019
New Revision: 355677

URL: http://llvm.org/viewvc/llvm-project?rev=355677&view=rev
Log:
Merging r355489:
------------------------------------------------------------------------
r355489 | hans | 2019-03-06 10:38:04 +0100 (Wed, 06 Mar 2019) | 1 line

clang-cl: Parse /Qspectre and a few other missing options (PR40964)
------------------------------------------------------------------------

Modified:
    cfe/branches/release_80/   (props changed)
    cfe/branches/release_80/include/clang/Driver/CLCompatOptions.td
    cfe/branches/release_80/test/Driver/cl-options.c

Propchange: cfe/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  8 01:27:18 2019
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351579-351580,352040,352079,352099,352102,352105,352119,352156,352221-352222,352229,352307,352323,352463,352539,352610,352672,352822,353142,353393,353402,353411,353431,353493,353495,353656,353943,353976,354035,354074,354147,354351,354721,354723,354937,354968,355491
+/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351579-351580,352040,352079,352099,352102,352105,352119,352156,352221-352222,352229,352307,352323,352463,352539,352610,352672,352822,353142,353393,353402,353411,353431,353493,353495,353656,353943,353976,354035,354074,354147,354351,354721,354723,354937,354968,355489,355491
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_80/include/clang/Driver/CLCompatOptions.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_80/include/clang/Driver/CLCompatOptions.td?rev=355677&r1=355676&r2=355677&view=diff
==============================================================================
--- cfe/branches/release_80/include/clang/Driver/CLCompatOptions.td (original)
+++ cfe/branches/release_80/include/clang/Driver/CLCompatOptions.td Fri Mar  8 01:27:18 2019
@@ -395,6 +395,8 @@ def _SLASH_Zo_ : CLIgnoredFlag<"Zo-">;
 
 // Unsupported:
 
+def _SLASH_await : CLFlag<"await">;
+def _SLASH_constexpr : CLJoined<"constexpr:">;
 def _SLASH_AI : CLJoinedOrSeparate<"AI">;
 def _SLASH_Bt : CLFlag<"Bt">;
 def _SLASH_Bt_plus : CLFlag<"Bt+">;
@@ -430,6 +432,9 @@ def _SLASH_Qfast_transcendentals : CLFla
 def _SLASH_QIfist : CLFlag<"QIfist">;
 def _SLASH_Qimprecise_fwaits : CLFlag<"Qimprecise_fwaits">;
 def _SLASH_Qpar : CLFlag<"Qpar">;
+def _SLASH_Qpar_report : CLJoined<"Qpar-report">;
+def _SLASH_Qsafe_fp_loads : CLFlag<"Qsafe_fp_loads">;
+def _SLASH_Qspectre : CLFlag<"Qspectre">;
 def _SLASH_Qvec_report : CLJoined<"Qvec-report">;
 def _SLASH_u : CLFlag<"u">;
 def _SLASH_V : CLFlag<"V">;

Modified: cfe/branches/release_80/test/Driver/cl-options.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_80/test/Driver/cl-options.c?rev=355677&r1=355676&r2=355677&view=diff
==============================================================================
--- cfe/branches/release_80/test/Driver/cl-options.c (original)
+++ cfe/branches/release_80/test/Driver/cl-options.c Fri Mar  8 01:27:18 2019
@@ -390,6 +390,8 @@
 // Unsupported but parsed options. Check that we don't error on them.
 // (/Zs is for syntax-only)
 // RUN: %clang_cl /Zs \
+// RUN:     /await \
+// RUN:     /constexpr:depth1000 /constexpr:backtrace1000 /constexpr:steps1000 \
 // RUN:     /AIfoo \
 // RUN:     /AI foo_does_not_exist \
 // RUN:     /Bt \
@@ -443,6 +445,9 @@
 // RUN:     /QIfist \
 // RUN:     /Qimprecise_fwaits \
 // RUN:     /Qpar \
+// RUN:     /Qpar-report:1 \
+// RUN:     /Qsafe_fp_loads \
+// RUN:     /Qspectre \
 // RUN:     /Qvec-report:2 \
 // RUN:     /u \
 // RUN:     /V \