fixup! [clang][RISCV] Enable struct of homogeneous scalable vector as function argument

Author: 4vtomat

clang/lib/CodeGen/CGCall.cpp

@@ -1531,8 +1531,7 @@ void ClangToLLVMArgMapping::construct(const ASTContext &Context,
     case ABIArgInfo::Direct: {
       // FIXME: handle sseregparm someday...
       llvm::StructType *STy = dyn_cast<llvm::StructType>(AI.getCoerceToType());
-      if (AI.isDirect() && AI.getCanBeFlattened() && STy &&
-          !STy->containsHomogeneousScalableVectorTypes()) {
+      if (AI.isDirect() && AI.getCanBeFlattened() && STy) {
         IRArgs.NumberOfArgs = STy->getNumElements();
       } else {
         IRArgs.NumberOfArgs = 1;
@@ -1714,8 +1713,7 @@ CodeGenTypes::GetFunctionType(const CGFunctionInfo &FI) {
       // FCAs, so we flatten them if this is safe to do for this argument.
       llvm::Type *argType = ArgInfo.getCoerceToType();
       llvm::StructType *st = dyn_cast<llvm::StructType>(argType);
-      if (st && ArgInfo.isDirect() && ArgInfo.getCanBeFlattened() &&
-          !st->containsHomogeneousScalableVectorTypes()) {
+      if (st && ArgInfo.isDirect() && ArgInfo.getCanBeFlattened()) {
         assert(NumIRArgs == st->getNumElements());
         for (unsigned i = 0, e = st->getNumElements(); i != e; ++i)
           ArgTypes[FirstIRArg + i] = st->getElementType(i);
@@ -3212,7 +3210,7 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
           dyn_cast<llvm::StructType>(ArgI.getCoerceToType());
       llvm::TypeSize StructSize;
       llvm::TypeSize PtrElementSize;
-      if (ArgI.isDirect() && ArgI.getCanBeFlattened() && STy &&
+      if (ArgI.isDirect() && !ArgI.getCanBeFlattened() && STy &&
           STy->getNumElements() > 1) {
         StructSize = CGM.getDataLayout().getTypeAllocSize(STy);
         PtrElementSize =
@@ -5279,7 +5277,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
       llvm::Type *SrcTy = ConvertTypeForMem(I->Ty);
       llvm::TypeSize SrcTypeSize;
       llvm::TypeSize DstTypeSize;
-      if (STy && ArgInfo.isDirect() && ArgInfo.getCanBeFlattened()) {
+      if (STy && ArgInfo.isDirect() && !ArgInfo.getCanBeFlattened()) {
         SrcTypeSize = CGM.getDataLayout().getTypeAllocSize(SrcTy);
         DstTypeSize = CGM.getDataLayout().getTypeAllocSize(STy);
         if (STy->containsHomogeneousScalableVectorTypes()) {

clang/lib/CodeGen/Targets/RISCV.cpp

@@ -433,7 +433,13 @@ ABIArgInfo RISCVABIInfo::classifyArgumentType(QualType Ty, bool IsFixed,
         return getNaturalAlignIndirect(Ty, /*ByVal=*/false);
     }
 
-    return ABIArgInfo::getDirect();
+    ABIArgInfo Info = ABIArgInfo::getDirect();
+
+    // If it is tuple type, it can't be flattened.
+    if (llvm::StructType *STy = dyn_cast<llvm::StructType>(CGT.ConvertType(Ty)))
+      Info.setCanBeFlattened(!STy->containsHomogeneousScalableVectorTypes());
+
+    return Info;
   }
 
   if (const VectorType *VT = Ty->getAs<VectorType>())