From f9df99da5273970596839b43d8d1f01041f29ded Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 31 May 2017 14:50:28 +0000 Subject: [PATCH] [clang-cl] Ignore /Zc:ternary, clang behaves this way already Addresses part of PR33237 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@304303 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/CLCompatOptions.td | 1 + test/Driver/cl-zc.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/include/clang/Driver/CLCompatOptions.td b/include/clang/Driver/CLCompatOptions.td index d0d9c679de..bb039c178e 100644 --- a/include/clang/Driver/CLCompatOptions.td +++ b/include/clang/Driver/CLCompatOptions.td @@ -324,6 +324,7 @@ def _SLASH_Zc_forScope : CLIgnoredFlag<"Zc:forScope">; def _SLASH_Zc_inline : CLIgnoredFlag<"Zc:inline">; def _SLASH_Zc_rvalueCast : CLIgnoredFlag<"Zc:rvalueCast">; def _SLASH_Zc_wchar_t : CLIgnoredFlag<"Zc:wchar_t">; +def _SLASH_Zc_ternary : CLIgnoredFlag<"Zc:ternary">; def _SLASH_Zm : CLIgnoredJoined<"Zm">; def _SLASH_Zo : CLIgnoredFlag<"Zo">; def _SLASH_Zo_ : CLIgnoredFlag<"Zo-">; diff --git a/test/Driver/cl-zc.cpp b/test/Driver/cl-zc.cpp index 2649629320..4414eb6ebb 100644 --- a/test/Driver/cl-zc.cpp +++ b/test/Driver/cl-zc.cpp @@ -53,6 +53,11 @@ // RUN: %clang_cl /c -### /Zc:inline- -- %s 2>&1 | FileCheck -check-prefix=INLINE-OFF %s // INLINE-OFF: argument unused during compilation +// RUN: %clang_cl /c -### /Zc:ternary -- %s 2>&1 | FileCheck -check-prefix=TERNARY-ON %s +// TERNARY-ON-NOT: argument unused during compilation +// RUN: %clang_cl /c -### /Zc:ternary- -- %s 2>&1 | FileCheck -check-prefix=TERNARY-OFF %s +// TERNARY-OFF: argument unused during compilation + // These never warn, but don't have an effect yet. -- 2.40.0