Fix MERGE_VALUE cases

Author: wzssyqa

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

@@ -11828,9 +11828,18 @@ void SelectionDAGISel::LowerArguments(const Function &F) {
         else if (Arg.hasAttribute(Attribute::ZExt))
           AssertOp = ISD::AssertZext;
 
-        ArgValues.push_back(getCopyFromParts(DAG, dl, &InVals[i], NumParts,
-                                             PartVT, VT, nullptr, NewRoot,
-                                             F.getCallingConv(), AssertOp));
+        SDValue OutVal =
+            getCopyFromParts(DAG, dl, &InVals[i], NumParts, PartVT, VT, nullptr,
+                             NewRoot, F.getCallingConv(), AssertOp);
+
+        FPClassTest NoFPClass = Arg.getNoFPClass();
+        if (NoFPClass != fcNone) {
+          SDValue SDNoFPClass = DAG.getTargetConstant(
+              static_cast<uint64_t>(NoFPClass), dl, MVT::i32);
+          OutVal = DAG.getNode(ISD::AssertNoFPClass, dl, OutVal.getValueType(),
+                               OutVal, SDNoFPClass);
+        }
+        ArgValues.push_back(OutVal);
       }
 
       i += NumParts;
@@ -11848,15 +11857,6 @@ void SelectionDAGISel::LowerArguments(const Function &F) {
     SDValue Res = DAG.getMergeValues(ArrayRef(ArgValues.data(), NumValues),
                                      SDB->getCurSDLoc());
 
-    FPClassTest NoFPClass = Arg.getNoFPClass();
-    if (NoFPClass != fcNone) {
-      SDValue SDNoFPClass =
-          DAG.getTargetConstant(static_cast<uint64_t>(NoFPClass), dl,
-                                EVT::getIntegerVT(*DAG.getContext(), 32));
-      Res = DAG.getNode(ISD::AssertNoFPClass, dl, Res.getValueType(), Res,
-                        SDNoFPClass);
-    }
-
     SDB->setValue(&Arg, Res);
     if (!TM.Options.EnableFastISel && Res.getOpcode() == ISD::BUILD_PAIR) {
       // We want to associate the argument with the frame index, among

llvm/test/CodeGen/AArch64/nofpclass.ll

@@ -20,3 +20,10 @@ entry:
   %c = call <4 x float> @llvm.maximumnum.v4f32(<4 x float> %a, <4 x float> %b)
   ret <4 x float> %c
 }
+
+define { float, float } @struct({ float, float } nofpclass(nan) %a) {
+; CHECK-LABEL: struct:
+; CHECK:       // %bb.0:
+; CHECK-NEXT:    ret
+   ret {float, float} %a
+}