Ban the use of __builtin_types_compatible_p in C++; g++ doesn't support it,
and it isn't clear exactly what it's supposed to mean. Thanks Eli!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72142 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index f31212e..4a6437d 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -110,6 +110,8 @@
def warn_redecl_library_builtin : Warning<
"incompatible redeclaration of library function %0">;
def err_builtin_definition : Error<"definition of builtin function %0">;
+def err_types_compatible_p_in_cplusplus : Error<
+ "__builtin_types_compatible_p is not valid in C++">;
/// parser diagnostics
def ext_typedef_without_a_name : ExtWarn<"typedef requires a name">;
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 3f99c68..bb85455 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -5022,6 +5022,12 @@
assert((!argT1.isNull() && !argT2.isNull()) && "Missing type argument(s)");
+ if (getLangOptions().CPlusPlus) {
+ Diag(BuiltinLoc, diag::err_types_compatible_p_in_cplusplus)
+ << SourceRange(BuiltinLoc, RPLoc);
+ return ExprError();
+ }
+
return Owned(new (Context) TypesCompatibleExpr(Context.IntTy, BuiltinLoc,
argT1, argT2, RPLoc));
}
diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp
index 5e91ada..ca19a3d 100644
--- a/lib/Sema/SemaTemplateInstantiateExpr.cpp
+++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp
@@ -469,22 +469,8 @@
Sema::OwningExprResult
TemplateExprInstantiator::VisitTypesCompatibleExpr(TypesCompatibleExpr *E) {
- QualType Type1 = SemaRef.InstantiateType(E->getArgType1(), TemplateArgs,
- /*FIXME:*/ E->getBuiltinLoc(),
- DeclarationName());
- if (Type1.isNull())
- return SemaRef.ExprError();
-
- QualType Type2 = SemaRef.InstantiateType(E->getArgType2(), TemplateArgs,
- /*FIXME:*/ E->getBuiltinLoc(),
- DeclarationName());
- if (Type2.isNull())
- return SemaRef.ExprError();
-
- return SemaRef.ActOnTypesCompatibleExpr(E->getBuiltinLoc(),
- Type1.getAsOpaquePtr(),
- Type2.getAsOpaquePtr(),
- E->getRParenLoc());
+ assert(false && "__builtin_types_compatible_p is not legal in C++");
+ return SemaRef.ExprError();
}
Sema::OwningExprResult
diff --git a/test/SemaCXX/types_compatible_p.cpp b/test/SemaCXX/types_compatible_p.cpp
new file mode 100644
index 0000000..30b1600
--- /dev/null
+++ b/test/SemaCXX/types_compatible_p.cpp
@@ -0,0 +1,5 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
+bool f() {
+ return __builtin_types_compatible_p(int, const int); // expected-error{{C++}}
+}
diff --git a/test/SemaTemplate/instantiate-expr-3.cpp b/test/SemaTemplate/instantiate-expr-3.cpp
index a17897b..abc2d92 100644
--- a/test/SemaTemplate/instantiate-expr-3.cpp
+++ b/test/SemaTemplate/instantiate-expr-3.cpp
@@ -71,18 +71,6 @@
template struct StatementExpr0<N1::X>; // expected-note{{instantiation}}
// ---------------------------------------------------------------------
-// __builtin_types_compatible_p
-// ---------------------------------------------------------------------
-template<typename T, typename U, bool Result>
-struct TypesCompatible0 {
- void f() {
- int a[__builtin_types_compatible_p(T, U) == Result? 1 : -1];
- }
-};
-
-template struct TypesCompatible0<int, const int, true>;
-
-// ---------------------------------------------------------------------
// __builtin_shufflevector
// ---------------------------------------------------------------------
typedef __attribute__(( ext_vector_type(2) )) double double2;