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
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index acbe415..7a7aabe 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -2996,22 +2996,13 @@
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,