final change

Author: spall

clang/include/clang/AST/ASTContext.h

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

clang/include/clang/Basic/LangOptions.h

@@ -816,6 +816,8 @@ class LangOptions : public LangOptionsBase {
            VisibilityForcedKinds::ForceHidden;
   }
 
+  bool allowArrayReturnTypes() const { return HLSL; }
+
   /// Remap path prefix according to -fmacro-prefix-path option.
   void remapPathPrefix(SmallVectorImpl<char> &Path) const;
 

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(DestType)) ||
+  if ((DestType->isArrayType() && !S.getLangOpts().allowArrayReturnTypes()) ||
       DestType->isFunctionType()) {
     unsigned diagID = diag::err_func_returning_array_function;
     if (Kind == FK_BlockPointer)

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(T)) ||
+  if ((T->isArrayType() && !getLangOpts().allowArrayReturnTypes()) ||
       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)) ||
+          ((T->isArrayType() && !S.getLangOpts().allowArrayReturnTypes()) ||
            T->isFunctionType()) &&
           (D.getName().getKind() !=
            UnqualifiedIdKind::IK_ConversionFunctionId)) {