This is an archive of the discontinued LLVM Phabricator instance.

Differential D40167

In stdbool.h, define bool, false, true only in gnu++98
ClosedPublic

Authored by sberg on Nov 17 2017, 12:04 AM.

Details

Reviewers
rsmith
doug.gregor
Commits
rGfeed26ff07b7: In stdbool.h, define bool, false, true only in gnu++98
rL320135: In stdbool.h, define bool, false, true only in gnu++98
rC320135: In stdbool.h, define bool, false, true only in gnu++98
Summary

GCC has meanwhile corrected that with the similar https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=216679 "C++11 explicitly forbids macros for bool, true and false."

Diff Detail

Event Timeline

sberg created this revision.Nov 17 2017, 12:04 AM

(This code had been introduced with http://llvm.org/viewvc/llvm-project?view=revision&revision=115028 "Define _Bool, bool, true, and false macros in <stdbool.h> when we're in a GNU-compatible C++ dialect. Fixes rdar://problem/8477819" mentioning: "Fixes rdar://problem/8477819." But I don't know what that is.)

Closed by commit rC320135: In stdbool.h, define bool, false, true only in gnu++98 (authored by sberg). · Explain WhyDec 8 2017, 12:28 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Headers/
5 lines
test/
Headers/
16 lines

Diff 123296

clang/lib/Headers/stdbool.h

Show All 26 Lines
#define __STDBOOL_H #define __STDBOOL_H
/* Don't define bool, true, and false in C++, except as a GNU extension. */ /* Don't define bool, true, and false in C++, except as a GNU extension. */
#ifndef __cplusplus #ifndef __cplusplus
#define bool _Bool #define bool _Bool
#define true 1 #define true 1
#define false 0 #define false 0
#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) #elif defined(__GNUC__) && !defined(__STRICT_ANSI__)
/* Define _Bool, bool, false, true as a GNU extension. */ /* Define _Bool as a GNU extension. */
#define _Bool bool #define _Bool bool
#if __cplusplus < 201103L
/* For C++98, define bool, false, true as a GNU extension. */
#define bool bool #define bool bool
#define false false #define false false
#define true true #define true true
#endif #endif
#endif
#define __bool_true_false_are_defined 1 #define __bool_true_false_are_defined 1
#endif /* __STDBOOL_H */ #endif /* __STDBOOL_H */

clang/test/Headers/stdbool.cpp

// RUN: %clang_cc1 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT %s // RUN: %clang_cc1 -std=gnu++98 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT-98 %s
// RUN: %clang_cc1 -std=gnu++11 -E -dM %s | FileCheck --check-prefix=CHECK-GNU-COMPAT-11 %s
// RUN: %clang_cc1 -std=c++98 -E -dM %s | FileCheck --check-prefix=CHECK-CONFORMING %s // RUN: %clang_cc1 -std=c++98 -E -dM %s | FileCheck --check-prefix=CHECK-CONFORMING %s
// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -verify -Weverything %s // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -verify -Weverything %s
#include <stdbool.h> #include <stdbool.h>
#define zzz #define zzz
// CHECK-GNU-COMPAT: #define _Bool bool // CHECK-GNU-COMPAT-98: #define _Bool bool
// CHECK-GNU-COMPAT: #define bool bool // CHECK-GNU-COMPAT-98: #define bool bool
// CHECK-GNU-COMPAT: #define false false // CHECK-GNU-COMPAT-98: #define false false
// CHECK-GNU-COMPAT: #define true true // CHECK-GNU-COMPAT-98: #define true true
// CHECK-GNU-COMPAT-11: #define _Bool bool
// CHECK-GNU-COMPAT-11-NOT: #define bool bool
// CHECK-GNU-COMPAT-11-NOT: #define false false
// CHECK-GNU-COMPAT-11-NOT: #define true true
// CHECK-CONFORMING-NOT: #define _Bool // CHECK-CONFORMING-NOT: #define _Bool
// CHECK-CONFORMING: #define __CHAR_BIT__ // CHECK-CONFORMING: #define __CHAR_BIT__
// CHECK-CONFORMING-NOT: #define false false // CHECK-CONFORMING-NOT: #define false false
// CHECK-CONFORMING: #define zzz // CHECK-CONFORMING: #define zzz
zzz zzz
// expected-no-diagnostics // expected-no-diagnostics
extern bool x; extern bool x;