Simplify code and test

Author: MaskRay

clang/lib/Driver/ToolChains/Clang.cpp

@@ -2556,7 +2556,7 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
   bool Crel = false, ExperimentalCrel = false;
   bool UseRelaxRelocations = C.getDefaultToolChain().useRelaxRelocations();
   bool UseNoExecStack = false;
-  std::optional<bool> Msa;
+  bool Msa = false;
   const char *MipsTargetFeature = nullptr;
   StringRef ImplicitIt;
   for (const Arg *A :
@@ -2786,7 +2786,7 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
           << "-Wa,--crel" << D.getTargetTriple();
     }
   }
-  if (Msa && *Msa)
+  if (Msa)
     CmdArgs.push_back("-mmsa");
   if (!UseRelaxRelocations)
     CmdArgs.push_back("-mrelax-relocations=no");

clang/test/Driver/mips-msa.c

@@ -1,19 +1,12 @@
 // RUN: %clang -### -c --target=mips64el-unknown-linux-gnuabi64 \
-// RUN:     -Wa,-mmsa %s -Werror 2>&1 | FileCheck %s --check-prefix=CHECK-MMSA
+// RUN:   -Wa,-mmsa %s -Werror 2>&1 | FileCheck %s --check-prefix=CHECK-MMSA
 // CHECK-MMSA: "-cc1" {{.*}}"-mmsa"
 
 // RUN: %clang -### -c --target=mips64el-unknown-linux-gnuabi64 \
-// RUN:     -Wa,-mno-msa,-mmsa %s -Werror 2>&1 | FileCheck %s --check-prefix=CHECK-MMSA
+// RUN:   -Wa,-mmsa,-mno-msa %s -Werror 2>&1 | FileCheck %s --check-prefix=CHECK-NOMMSA
+// CHECK-NOMMSA:     "-cc1"
+// CHECK-NOMMSA-NOT: "-mssa"
 
-// RUN: %clang -### -c --target=mips64el-unknown-linux-gnuabi64 \
-// RUN:     -Wa,-mmsa,-mno-msa %s -Werror 2>&1 | FileCheck %s --check-prefix=CHECK-NOMMSA
-// CHECK-NOMMSA: "-cc1"
-
-// RUN: %clang -### -c --target=mips64el-unknown-linux-gnuabi64 \
-// RUN:    -fno-integrated-as -Wa,-mmsa %s -Werror 2>&1 | FileCheck %s --check-prefix=MIPS-MSA
-// MIPS-MSA: as{{(.exe)?}}" "-march" "mips64r2" "-mabi" "64" "-EL" "-KPIC" "-mmsa"
-
-// RUN: %clang -### -c --target=mips64el-unknown-linux-gnuabi64 \
-// RUN:    -fno-integrated-as -Wa,-mno-msa %s -Werror 2>&1 | FileCheck %s --check-prefix=MIPS-NOMSA
-// MIPS-NOMSA: as{{(.exe)?}}"
-// MIPS-NOMSA-NOT: "-mmsa"
+// RUN: not %clang -### -c --target=x86_64 -Wa,-mmsa -Wa,-mno-msa %s 2>&1 | FileCheck %s --check-prefix=ERR
+// ERR: error: unsupported argument '-mmsa' to option '-Wa,'
+// ERR: error: unsupported argument '-mno-msa' to option '-Wa,'