address pr comments round 2

Author: spall

clang/include/clang/AST/ASTContext.h

@@ -2805,7 +2805,9 @@ class ASTContext : public RefCountedBase<ASTContext> {
 
   // Determine whether an array is a valid return type
   // Array is a valid return type for HLSL
-  bool isReturnableArrayType() const { return getLangOpts().HLSL; }
+  bool isReturnableArrayType(QualType T) const {
+    return T->isArrayType() && getLangOpts().HLSL;
+  }
 
   /// Determine whether the given types are equivalent after
   /// cvr-qualifiers have been removed.

clang/lib/Sema/SemaExpr.cpp

@@ -20681,7 +20681,7 @@ ExprResult RebuildUnknownAnyExpr::VisitCallExpr(CallExpr *E) {
   const FunctionType *FnType = CalleeType->castAs<FunctionType>();
 
   // Verify that this is a legal result type of a function.
-  if ((DestType->isArrayType() && !S.Context.isReturnableArrayType()) ||
+  if ((DestType->isArrayType() && !S.Context.isReturnableArrayType(DestType)) ||
       DestType->isFunctionType()) {
     unsigned diagID = diag::err_func_returning_array_function;
     if (Kind == FK_BlockPointer)
@@ -20761,8 +20761,7 @@ ExprResult RebuildUnknownAnyExpr::VisitCallExpr(CallExpr *E) {
 
 ExprResult RebuildUnknownAnyExpr::VisitObjCMessageExpr(ObjCMessageExpr *E) {
   // Verify that this is a legal result type of a call.
-  if ((DestType->isArrayType() && !S.Context.isReturnableArrayType()) ||
-      DestType->isFunctionType()) {
+  if (DestType->isArrayType() || DestType->isFunctionType()) {
     S.Diag(E->getExprLoc(), diag::err_func_returning_array_function)
       << DestType->isFunctionType() << DestType;
     return ExprError();

clang/lib/Sema/SemaType.cpp

@@ -2530,7 +2530,7 @@ QualType Sema::BuildMatrixType(QualType ElementTy, Expr *NumRows, Expr *NumCols,
 }
 
 bool Sema::CheckFunctionReturnType(QualType T, SourceLocation Loc) {
-  if ((T->isArrayType() && !Context.isReturnableArrayType()) ||
+  if ((T->isArrayType() && !Context.isReturnableArrayType(T)) ||
       T->isFunctionType()) {
     Diag(Loc, diag::err_func_returning_array_function)
       << T->isFunctionType() << T;
@@ -4936,7 +4936,7 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state,
       // C99 6.7.5.3p1: The return type may not be a function or array type.
       // For conversion functions, we'll diagnose this particular error later.
       if (!D.isInvalidType() &&
-          ((T->isArrayType() && !S.Context.isReturnableArrayType()) ||
+          ((T->isArrayType() && !S.Context.isReturnableArrayType(T)) ||
            T->isFunctionType()) &&
           (D.getName().getKind() !=
            UnqualifiedIdKind::IK_ConversionFunctionId)) {