1 files changed, 4 insertions, 13 deletions
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,