clang-cl: Make /d1reportAllClassLayout actually work and improve test

See review thread for r301567.

llvm-svn: 364901

diff --git a/clang/include/clang/Driver/CLCompatOptions.td b/clang/include/clang/Driver/CLCompatOptions.td
index 577a667..4c25e26 100644 (file)
--- a/clang/include/clang/Driver/CLCompatOptions.td
+++ b/clang/include/clang/Driver/CLCompatOptions.td
@@ -63,7 +63,8 @@ def _SLASH_c : CLFlag<"c">, HelpText<"Compile only">, Alias<c>;
 def _SLASH_d1PP : CLFlag<"d1PP">,
   HelpText<"Retain macro definitions in /E mode">, Alias<dD>;
 def _SLASH_d1reportAllClassLayout : CLFlag<"d1reportAllClassLayout">,
-  HelpText<"Dump record layout information">, Alias<fdump_record_layouts>;
+  HelpText<"Dump record layout information">,
+Alias<Xclang>, AliasArgs<["-fdump-record-layouts"]>;
 def _SLASH_diagnostics_caret : CLFlag<"diagnostics:caret">,
   HelpText<"Enable caret and column diagnostics (on by default)">;
 def _SLASH_diagnostics_column : CLFlag<"diagnostics:column">,

diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
index 2b71bd0..3b377b3 100644 (file)
--- a/clang/test/Driver/cl-options.c
+++ b/clang/test/Driver/cl-options.c
@@ -14,7 +14,10 @@
 // C_P: "-E"
 // C_P: "-C"
 
-// RUN: %clang_cl /d1reportAllClassLayout -### -- %s 2>&1 | FileCheck -check-prefix=d1reportAllClassLayout %s
+// RUN: %clang_cl /d1reportAllClassLayout -### /c /WX -- %s 2>&1 | \
+// RUN:     FileCheck -check-prefix=d1reportAllClassLayout %s
+// d1reportAllClassLayout-NOT: warning:
+// d1reportAllClassLayout-NOT: error:
 // d1reportAllClassLayout: -fdump-record-layouts
 
 // RUN: %clang_cl /Dfoo=bar /D bar=baz /DMYDEF#value /DMYDEF2=foo#bar /DMYDEF3#a=b /DMYDEF4# \