From 536d2e30721e2b1690ac4018c033e36c096820bb Mon Sep 17 00:00:00 2001 From: Jan Korous Date: Wed, 18 Apr 2018 13:38:39 +0000 Subject: [PATCH] [Sema] Disable built-in increment operator for bool in overload resolution in C++17 Following: https://llvm.org/svn/llvm-project/cfe/trunk@329804 For C++17 the wording of [over.built] p4 excluded bool: For every pair (T , vq), where T is an arithmetic type other than bool, there exist candidate operator functions of the form vq T & operator++(vq T &); T operator++(vq T &, int); Differential Revision: https://reviews.llvm.org/D45569 llvm-svn: 330254 --- clang/lib/Sema/SemaOverload.cpp | 16 +++++++++++----- .../test/SemaCXX/overloaded-builtin-operators-cxx17.cpp | 10 ++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 clang/test/SemaCXX/overloaded-builtin-operators-cxx17.cpp diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 9cce75c..64cd52c 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -7782,11 +7782,13 @@ public: InitArithmeticTypes(); } + // Increment is deprecated for bool since C++17. + // // C++ [over.built]p3: // - // For every pair (T, VQ), where T is an arithmetic type, and VQ - // is either volatile or empty, there exist candidate operator - // functions of the form + // For every pair (T, VQ), where T is an arithmetic type other + // than bool, and VQ is either volatile or empty, there exist + // candidate operator functions of the form // // VQ T& operator++(VQ T&); // T operator++(VQ T&, int); @@ -7805,8 +7807,12 @@ public: for (unsigned Arith = 0; Arith < NumArithmeticTypes; ++Arith) { const auto TypeOfT = ArithmeticTypes[Arith]; - if (Op == OO_MinusMinus && TypeOfT == S.Context.BoolTy) - continue; + if (TypeOfT == S.Context.BoolTy) { + if (Op == OO_MinusMinus) + continue; + if (Op == OO_PlusPlus && S.getLangOpts().CPlusPlus17) + continue; + } addPlusPlusMinusMinusStyleOverloads( TypeOfT, VisibleTypeConversionsQuals.hasVolatile(), diff --git a/clang/test/SemaCXX/overloaded-builtin-operators-cxx17.cpp b/clang/test/SemaCXX/overloaded-builtin-operators-cxx17.cpp new file mode 100644 index 0000000..05f85f8 --- /dev/null +++ b/clang/test/SemaCXX/overloaded-builtin-operators-cxx17.cpp @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -fsyntax-only -fshow-overloads=best -verify -triple x86_64-linux-gnu -std=c++17 %s + +struct BoolRef { + operator bool&(); +}; + +void foo(BoolRef br) { + // C++ [over.built]p3: Increment for bool was removed in C++17. + bool b = br++; // expected-error{{cannot increment value of type 'BoolRef'}} +} \ No newline at end of file -- 2.7.4