[llvm] [NFC][llvm] Remove duplicate isUEFI check (PR #136593)

[Prabhu Rajasekaran via llvm-commits]

https://github.com/Prabhuk updated https://github.com/llvm/llvm-project/pull/136593

>From 8eb73d02ac0b402a1a56e17a1a3dbdd4f31e5b21 Mon Sep 17 00:00:00 2001
From: prabhukr <prabhukr at google.com>
Date: Fri, 21 Mar 2025 19:52:01 +0000
Subject: [PATCH 1/2] [llvm] Use masm for UEFI

For UEFI targets use Microsoft masm.
---
 llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
index ad94e306f339e..9d86f8eb91506 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -444,7 +444,7 @@ static MCAsmInfo *createX86MCAsmInfo(const MCRegisterInfo &MRI,
     // Force the use of an ELF container.
     MAI = new X86ELFMCAsmInfo(TheTriple);
   } else if (TheTriple.isWindowsMSVCEnvironment() ||
-             TheTriple.isWindowsCoreCLREnvironment()) {
+             TheTriple.isWindowsCoreCLREnvironment() || TheTriple.isUEFI()) {
     if (Options.getAssemblyLanguage().equals_insensitive("masm"))
       MAI = new X86MCAsmInfoMicrosoftMASM(TheTriple);
     else

>From 6d9ca5b4b130f63505bd5b467a7eb92805165de5 Mon Sep 17 00:00:00 2001
From: prabhukr <prabhukr at google.com>
Date: Mon, 21 Apr 2025 11:09:12 -0700
Subject: [PATCH 2/2] [NFC][llvm] Remove duplicate isUEFI check

In `X86MCTargetDesc.cpp` while fixing the handling of UEFI target in the
`createX86MCAsmInfo` function (#132461), the previous incorrect handling
of isUEFI was not removed. This patch cleans up that case.
---
 llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
index 9d86f8eb91506..c414fd6016ce3 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -452,8 +452,6 @@ static MCAsmInfo *createX86MCAsmInfo(const MCRegisterInfo &MRI,
   } else if (TheTriple.isOSCygMing() ||
              TheTriple.isWindowsItaniumEnvironment()) {
     MAI = new X86MCAsmInfoGNUCOFF(TheTriple);
-  } else if (TheTriple.isUEFI()) {
-    MAI = new X86MCAsmInfoGNUCOFF(TheTriple);
   } else {
     // The default is ELF.
     MAI = new X86ELFMCAsmInfo(TheTriple);