From 9cf632cc3514cdcf1e45bf6b5c68c734b41679b1 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Sun, 1 May 2011 07:49:26 +0000 Subject: Simplify the flow of some of the array type trait code. Completely remove a switch which selected between the same two types. llvm-svn: 130649 --- clang/lib/Sema/SemaExprCXX.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'clang/lib/Sema/SemaExprCXX.cpp') diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index acbe4154caf..7a7aabeafe4 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -2996,22 +2996,13 @@ ExprResult Sema::BuildArrayTypeTrait(ArrayTypeTrait ATT, Expr* DimExpr, SourceLocation RParen) { QualType T = TSInfo->getType(); - - uint64_t Value; - if (!T->isDependentType()) - Value = EvaluateArrayTypeTrait(*this, ATT, T, DimExpr, KWLoc); - else + if (T->isDependentType()) return ExprError(); - // Select trait result type. - QualType ResultType; - switch (ATT) { - case ATT_ArrayRank: ResultType = Context.IntTy; break; - case ATT_ArrayExtent: ResultType = Context.IntTy; break; - } - + uint64_t Value = EvaluateArrayTypeTrait(*this, ATT, T, DimExpr, KWLoc); return Owned(new (Context) ArrayTypeTraitExpr(KWLoc, ATT, TSInfo, Value, - DimExpr, RParen, ResultType)); + DimExpr, RParen, + Context.IntTy)); } ExprResult Sema::ActOnExpressionTrait(ExpressionTrait ET, -- cgit v1.2.3