Switch __is_scalar to use the isScalarType predicate rather than

duplicating its logic.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@130654 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 0f715f0b8f34c0b0996347d36bdef028d04ade78..2664c7811caafb570ebb17e00741ae80d20b3be6 100644 (file)
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -2507,12 +2507,7 @@ static bool EvaluateUnaryTypeTrait(Sema &Self, UnaryTypeTrait UTT,
     // !__is_reference(T) && !__is_function(T) && !__is_void(T).
     return ! (T->isReferenceType() || T->isFunctionType() || T->isVoidType());
   case UTT_IsScalar:
-    // Scalar type is defined in Section 3.9 p10 of the Working Draft.
-    // Essentially:
-    // __is_arithmetic( T ) || __is_enumeration(T) ||
-    // __is_pointer(T) || __is_member_pointer(T)
-    return (T->isArithmeticType() || T->isEnumeralType() ||
-            T->isPointerType() || T->isMemberPointerType());
+    return T->isScalarType();
   case UTT_IsCompound:
     return ! (T->isVoidType() || T->isArithmeticType()) || T->isEnumeralType();
   case UTT_IsMemberPointer: