[llvm-branch-commits] [llvm] MC: Remove MCAsmInfo::ExceptionsType (PR #233030)
Matt Arsenault via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Sat Oct 17 02:59:42 PDT 2026
https://github.com/arsenm updated https://github.com/llvm/llvm-project/pull/233030
>From 0e87f59174ba353598c7b240662379060d70557c Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Thu, 15 Oct 2026 09:43:23 +0200
Subject: [PATCH] MC: Remove MCAsmInfo::ExceptionsType
The exception model now comes from the module, and the MCAsmInfo
predicates that depend on it take the model as a parameter. The
target's default model is still available from
Triple::getDefaultExceptionHandling.
Co-authored-by: Claude Opus 5.5 <noreply at anthropic.com>
---
llvm/include/llvm/CodeGen/AsmPrinter.h | 4 ++--
llvm/include/llvm/MC/MCAsmInfo.h | 4 ----
llvm/lib/CodeGen/CodeGenTargetMachineImpl.cpp | 4 ----
llvm/lib/MC/MCAsmInfoXCOFF.cpp | 2 --
.../AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp | 6 ------
.../Target/ARC/MCTargetDesc/ARCMCAsmInfo.cpp | 1 -
.../Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp | 17 -----------------
llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h | 1 -
.../Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp | 2 --
.../Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp | 1 -
.../Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp | 1 -
.../MCTargetDesc/LoongArchMCAsmInfo.cpp | 1 -
.../Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp | 3 ---
.../MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp | 2 --
.../Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp | 3 ---
.../PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp | 3 ---
.../RISCV/MCTargetDesc/RISCVMCAsmInfo.cpp | 2 --
.../Sparc/MCTargetDesc/SparcMCAsmInfo.cpp | 2 --
.../SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp | 2 --
llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp | 1 -
.../MCTargetDesc/WebAssemblyMCAsmInfo.cpp | 1 -
.../Target/X86/MCTargetDesc/X86MCAsmInfo.cpp | 11 -----------
.../XCore/MCTargetDesc/XCoreMCAsmInfo.cpp | 1 -
.../Xtensa/MCTargetDesc/XtensaMCAsmInfo.cpp | 1 -
24 files changed, 2 insertions(+), 74 deletions(-)
diff --git a/llvm/include/llvm/CodeGen/AsmPrinter.h b/llvm/include/llvm/CodeGen/AsmPrinter.h
index c2672f8a6b618a..35adbc85fe1eb7 100644
--- a/llvm/include/llvm/CodeGen/AsmPrinter.h
+++ b/llvm/include/llvm/CodeGen/AsmPrinter.h
@@ -546,8 +546,8 @@ class LLVM_ABI AsmPrinter : public MachineFunctionPass {
/// Since emitting CFI unwind information is entangled with supporting the
/// exceptions, this returns true for platforms which use CFI unwind
- /// information for other purposes (debugging, sanitizers, ...) when
- /// `MCAsmInfo::ExceptionsType == ExceptionHandling::None`.
+ /// information for other purposes (debugging, sanitizers, ...) when the
+ /// module's exception model is `ExceptionHandling::None`.
bool usesCFIWithoutEH() const;
/// Print to the current output stream assembly representations of the
diff --git a/llvm/include/llvm/MC/MCAsmInfo.h b/llvm/include/llvm/MC/MCAsmInfo.h
index 6e7b6f1b06c58e..6ca90b10cd99a6 100644
--- a/llvm/include/llvm/MC/MCAsmInfo.h
+++ b/llvm/include/llvm/MC/MCAsmInfo.h
@@ -353,9 +353,6 @@ class LLVM_ABI MCAsmInfo {
/// false.
bool SupportsDebugInformation = false;
- /// Default exception handling model for the target. Defaults to None.
- ExceptionHandling ExceptionsType = ExceptionHandling::None;
-
/// True if target uses CFI unwind information for other purposes than EH
/// (debugging / sanitizers) when the exception model is
/// `ExceptionHandling::None`.
@@ -654,7 +651,6 @@ class LLVM_ABI MCAsmInfo {
bool doesSupportDebugInformation() const { return SupportsDebugInformation; }
- ExceptionHandling getExceptionHandlingType() const { return ExceptionsType; }
WinEH::EncodingType getWinEHEncodingType() const { return WinEHEncodingType; }
bool usesCFIWithoutEH(ExceptionHandling EH) const {
diff --git a/llvm/lib/CodeGen/CodeGenTargetMachineImpl.cpp b/llvm/lib/CodeGen/CodeGenTargetMachineImpl.cpp
index f61ab04b04e21d..64aaea2d7b6e2e 100644
--- a/llvm/lib/CodeGen/CodeGenTargetMachineImpl.cpp
+++ b/llvm/lib/CodeGen/CodeGenTargetMachineImpl.cpp
@@ -80,10 +80,6 @@ void CodeGenTargetMachineImpl::initAsmInfo() {
TmpAsmInfo->setFullRegisterNames(Options.MCOptions.PPCUseFullRegisterNames);
- assert(TmpAsmInfo->getExceptionHandlingType() ==
- getTargetTriple().getDefaultExceptionHandling() &&
- "MCAsmInfo and Triple disagree on default exception handling type");
-
AsmInfo.reset(TmpAsmInfo);
}
diff --git a/llvm/lib/MC/MCAsmInfoXCOFF.cpp b/llvm/lib/MC/MCAsmInfoXCOFF.cpp
index 534457adac4edc..e0d2f591d17340 100644
--- a/llvm/lib/MC/MCAsmInfoXCOFF.cpp
+++ b/llvm/lib/MC/MCAsmInfoXCOFF.cpp
@@ -39,8 +39,6 @@ MCAsmInfoXCOFF::MCAsmInfoXCOFF(const MCTargetOptions &Options)
LCOMMDirectiveAlignmentType = LCOMM::Log2Alignment;
HasDotTypeDotSizeDirective = false;
ParseInlineAsmUsingAsmParser = true;
-
- ExceptionsType = ExceptionHandling::AIX;
}
bool MCAsmInfoXCOFF::useCodeAlign(const MCSection &Sec) const {
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
index d423d5e8d8f22d..6d739b5a7d2565 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
@@ -149,7 +149,6 @@ AArch64MCAsmInfoDarwin::AArch64MCAsmInfoDarwin(bool IsILP32,
UsesELFSectionDirectiveForBSS = true;
SupportsDebugInformation = true;
UseDataRegionDirectives = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
initializeAtSpecifiers(MachOAtSpecifiers);
UseAtForSpecifier = false;
@@ -226,9 +225,6 @@ AArch64MCAsmInfoELF::AArch64MCAsmInfoELF(const Triple &T,
SupportsDebugInformation = true;
- // Exceptions handling
- ExceptionsType = ExceptionHandling::DwarfCFI;
-
HasIdentDirective = true;
initializeAtSpecifiers(ELFAtSpecifiers);
@@ -267,7 +263,6 @@ AArch64MCAsmInfoMicrosoftCOFF::AArch64MCAsmInfoMicrosoftCOFF(
CodePointerSize = 8;
CommentString = "//";
- ExceptionsType = ExceptionHandling::WinEH;
WinEHEncodingType = WinEH::EncodingType::Itanium;
initializeAtSpecifiers(COFFAtSpecifiers);
@@ -297,7 +292,6 @@ AArch64MCAsmInfoGNUCOFF::AArch64MCAsmInfoGNUCOFF(const MCTargetOptions &Options)
CodePointerSize = 8;
CommentString = "//";
- ExceptionsType = ExceptionHandling::WinEH;
WinEHEncodingType = WinEH::EncodingType::Itanium;
initializeAtSpecifiers(COFFAtSpecifiers);
diff --git a/llvm/lib/Target/ARC/MCTargetDesc/ARCMCAsmInfo.cpp b/llvm/lib/Target/ARC/MCTargetDesc/ARCMCAsmInfo.cpp
index 811ae7a98f882b..2e42913aada517 100644
--- a/llvm/lib/Target/ARC/MCTargetDesc/ARCMCAsmInfo.cpp
+++ b/llvm/lib/Target/ARC/MCTargetDesc/ARCMCAsmInfo.cpp
@@ -27,6 +27,5 @@ ARCMCAsmInfo::ARCMCAsmInfo(const Triple &TT, const MCTargetOptions &Options)
ProtectedVisibilityAttr = MCSA_Invalid;
// Debug
- ExceptionsType = ExceptionHandling::DwarfCFI;
DwarfRegNumForCFI = true;
}
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
index c2fd9e98d168c5..8412ae211d09da 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
@@ -64,11 +64,6 @@ ARMMCAsmInfoDarwin::ARMMCAsmInfoDarwin(const Triple &TheTriple,
// Conditional Thumb 4-byte instructions can have an implicit IT.
MaxInstLength = 6;
- // Exceptions handling
- ExceptionsType = (TheTriple.isOSDarwin() && !TheTriple.isWatchABI())
- ? ExceptionHandling::SjLj
- : ExceptionHandling::DwarfCFI;
-
initializeAtSpecifiers(atSpecifiers);
}
@@ -92,16 +87,6 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo(const Triple &TheTriple,
// Conditional Thumb 4-byte instructions can have an implicit IT.
MaxInstLength = 6;
- // Exceptions handling
- switch (TheTriple.getOS()) {
- case Triple::NetBSD:
- ExceptionsType = ExceptionHandling::DwarfCFI;
- break;
- default:
- ExceptionsType = ExceptionHandling::ARM;
- break;
- }
-
initializeAtSpecifiers(atSpecifiers);
// foo(plt) instead of foo at plt
UseAtForSpecifier = false;
@@ -125,7 +110,6 @@ ARMCOFFMCAsmInfoMicrosoft::ARMCOFFMCAsmInfoMicrosoft(
: MCAsmInfoMicrosoft(Options) {
AlignmentIsInBytes = false;
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::WinEH;
WinEHEncodingType = WinEH::EncodingType::Itanium;
InternalSymbolPrefix = "$M";
CommentString = "@";
@@ -147,7 +131,6 @@ ARMCOFFMCAsmInfoGNU::ARMCOFFMCAsmInfoGNU(const MCTargetOptions &Options)
InternalSymbolPrefix = ".L";
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::WinEH;
WinEHEncodingType = WinEH::EncodingType::Itanium;
DwarfRegNumForCFI = false;
diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h b/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
index d67412f9116349..b4462364060b68 100644
--- a/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
+++ b/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
@@ -34,7 +34,6 @@ class BPFMCAsmInfo : public MCAsmInfoELF {
HasIdentDirective = false;
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
MinInstAlignment = 8;
// the default is 4 and it only affects dwarf elf output
diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp
index f055d7bf9d5d7d..fe58c42680e37f 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCAsmInfo.cpp
@@ -38,8 +38,6 @@ CSKYMCAsmInfo::CSKYMCAsmInfo(const Triple &TargetTriple,
// Uses '.section' before '.bss' directive
UsesELFSectionDirectiveForBSS = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
-
initializeAtSpecifiers(atSpecifiers);
}
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
index 8c91fad24dbf02..ab4026c80bbb7a 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
@@ -54,7 +54,6 @@ HexagonMCAsmInfo::HexagonMCAsmInfo(const Triple &TT,
MinInstAlignment = 4;
UsesELFSectionDirectiveForBSS = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
UseLogicalShr = false;
initializeAtSpecifiers(atSpecifiers);
diff --git a/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp b/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp
index 17c4eb9a4d859c..3c7ac3f2d55247 100644
--- a/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp
+++ b/llvm/lib/Target/Lanai/MCTargetDesc/LanaiMCAsmInfo.cpp
@@ -25,7 +25,6 @@ LanaiMCAsmInfo::LanaiMCAsmInfo(const Triple & /*TheTriple*/,
IsLittleEndian = false;
InternalSymbolPrefix = ".L";
WeakRefDirective = "\t.weak\t";
- ExceptionsType = ExceptionHandling::DwarfCFI;
// Lanai assembly requires ".section" before ".bss"
UsesELFSectionDirectiveForBSS = true;
diff --git a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCAsmInfo.cpp b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCAsmInfo.cpp
index 680c9e5c0f7628..f3c4cd262cec47 100644
--- a/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCAsmInfo.cpp
+++ b/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCAsmInfo.cpp
@@ -249,7 +249,6 @@ LoongArchMCAsmInfo::LoongArchMCAsmInfo(const Triple &TT,
CommentString = "#";
SupportsDebugInformation = true;
DwarfRegNumForCFI = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
}
void LoongArchMCAsmInfo::printSpecifierExpr(raw_ostream &OS,
diff --git a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
index a0c119e5a3f302..f1637c7b579bf2 100644
--- a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
+++ b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
@@ -39,9 +39,6 @@ M68kELFMCAsmInfo::M68kELFMCAsmInfo(const Triple &T,
// Debug Information
SupportsDebugInformation = true;
- // Exceptions handling
- ExceptionsType = ExceptionHandling::DwarfCFI;
-
UseMotorolaIntegers = true;
CommentString = ";";
diff --git a/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp b/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp
index f03d84d0d67484..2562f37f5d2e24 100644
--- a/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp
+++ b/llvm/lib/Target/MSP430/MCTargetDesc/MSP430MCAsmInfo.cpp
@@ -32,6 +32,4 @@ MSP430MCAsmInfo::MSP430MCAsmInfo(const Triple &TT,
UsesELFSectionDirectiveForBSS = true;
SupportsDebugInformation = true;
-
- ExceptionsType = ExceptionHandling::DwarfCFI;
}
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp
index dbb0af75f3651d..e99ddac0aeb0f2 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp
@@ -44,7 +44,6 @@ MipsELFMCAsmInfo::MipsELFMCAsmInfo(const Triple &TheTriple,
ZeroDirective = "\t.space\t";
UseAssignmentForEHBegin = true;
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
DwarfRegNumForCFI = true;
}
@@ -55,8 +54,6 @@ MipsCOFFMCAsmInfo::MipsCOFFMCAsmInfo(const MCTargetOptions &Options)
HasSingleParameterDotFile = true;
WinEHEncodingType = WinEH::EncodingType::Itanium;
- ExceptionsType = ExceptionHandling::WinEH;
-
InternalSymbolPrefix = ".L";
AllowAtInName = true;
}
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
index 63a8142f1885fe..3d404c7e401912 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
@@ -201,9 +201,6 @@ PPCELFMCAsmInfo::PPCELFMCAsmInfo(bool is64Bit, const Triple &T,
// Set up DWARF directives
MinInstAlignment = 4;
- // Exceptions handling
- ExceptionsType = ExceptionHandling::DwarfCFI;
-
ZeroDirective = "\t.space\t";
Data64bitsDirective = is64Bit ? "\t.quad\t" : nullptr;
AssemblerDialect = 1; // New-Style mnemonics.
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCAsmInfo.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCAsmInfo.cpp
index dee64530230d15..7ced80c249d76e 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCAsmInfo.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCAsmInfo.cpp
@@ -27,7 +27,6 @@ RISCVMCAsmInfo::RISCVMCAsmInfo(const Triple &TT, const MCTargetOptions &Options)
CommentString = "#";
AlignmentIsInBytes = false;
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
Data16bitsDirective = "\t.half\t";
Data32bitsDirective = "\t.word\t";
// The default symbol subtraction results in an ADD/SUB relocation pair.
@@ -57,7 +56,6 @@ RISCVMCAsmInfoDarwin::RISCVMCAsmInfoDarwin(const MCTargetOptions &Options)
AlignmentIsInBytes = false;
SupportsDebugInformation = true;
UseDataRegionDirectives = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
Data16bitsDirective = "\t.half\t";
Data32bitsDirective = "\t.word\t";
}
diff --git a/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp b/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp
index d3a748ac8b0edc..4569ca595be12d 100644
--- a/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp
+++ b/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp
@@ -40,8 +40,6 @@ SparcELFMCAsmInfo::SparcELFMCAsmInfo(const Triple &TheTriple,
CommentString = "!";
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
-
UsesELFSectionDirectiveForBSS = true;
DwarfFDERelSymbolSpec = ELF::R_SPARC_DISP32;
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
index a51d5e9eac2fed..d11ea1a62f450e 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
@@ -30,7 +30,6 @@ SystemZMCAsmInfoELF::SystemZMCAsmInfoELF(const Triple &TT,
CalleeSaveStackSlotSize = 8;
CodePointerSize = 8;
Data64bitsDirective = "\t.quad\t";
- ExceptionsType = ExceptionHandling::DwarfCFI;
IsLittleEndian = false;
MaxInstLength = 6;
SupportsDebugInformation = true;
@@ -52,7 +51,6 @@ SystemZMCAsmInfoGOFF::SystemZMCAsmInfoGOFF(const Triple &TT,
CodePointerSize = 8;
CommentString = "*";
UsesSetToEquateSymbol = true;
- ExceptionsType = ExceptionHandling::ZOS;
IsHLASM = true;
IsLittleEndian = false;
MaxInstLength = 6;
diff --git a/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp b/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
index 6fbfb8b8e092f8..aef303835ac8cd 100644
--- a/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
+++ b/llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp
@@ -94,7 +94,6 @@ VEELFMCAsmInfo::VEELFMCAsmInfo(const Triple &TheTriple,
UsesELFSectionDirectiveForBSS = true;
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::SjLj;
initializeAtSpecifiers(atSpecifiers);
}
diff --git a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
index 1746c1a2719aba..539788bcee4f02 100644
--- a/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
+++ b/llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyMCAsmInfo.cpp
@@ -58,7 +58,6 @@ WebAssemblyMCAsmInfo::WebAssemblyMCAsmInfo(const Triple &T,
LCOMMDirectiveAlignmentType = LCOMM::Log2Alignment;
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::None;
initializeAtSpecifiers(atSpecifiers);
}
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
index ace32354153178..9178c45c094acb 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
@@ -74,9 +74,6 @@ X86MCAsmInfoDarwin::X86MCAsmInfoDarwin(const Triple &T,
SupportsDebugInformation = true;
UseDataRegionDirectives = X86_MC::getCLOpts(Options).mark_data_regions;
- // Exceptions handling
- ExceptionsType = ExceptionHandling::DwarfCFI;
-
// old assembler lacks some directives
// FIXME: this should really be a check on the assembler characteristics
// rather than OS version
@@ -116,9 +113,6 @@ X86ELFMCAsmInfo::X86ELFMCAsmInfo(const Triple &T,
// Debug Information
SupportsDebugInformation = true;
- // Exceptions handling
- ExceptionsType = ExceptionHandling::DwarfCFI;
-
initializeAtSpecifiers(atSpecifiers);
}
@@ -148,8 +142,6 @@ X86MCAsmInfoMicrosoft::X86MCAsmInfoMicrosoft(const Triple &Triple,
WinEHEncodingType = WinEH::EncodingType::X86;
}
- ExceptionsType = ExceptionHandling::WinEH;
-
AssemblerDialect = X86_MC::getCLOpts(Options).asm_syntax;
AllowAtInName = true;
@@ -182,9 +174,6 @@ X86MCAsmInfoGNUCOFF::X86MCAsmInfoGNUCOFF(const Triple &Triple,
InternalSymbolPrefix = ".L";
CodePointerSize = 8;
WinEHEncodingType = WinEH::EncodingType::Itanium;
- ExceptionsType = ExceptionHandling::WinEH;
- } else {
- ExceptionsType = ExceptionHandling::DwarfCFI;
}
AssemblerDialect = X86_MC::getCLOpts(Options).asm_syntax;
diff --git a/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCAsmInfo.cpp b/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCAsmInfo.cpp
index e1bdf0dd151855..b4d9a1c304c7e8 100644
--- a/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCAsmInfo.cpp
+++ b/llvm/lib/Target/XCore/MCTargetDesc/XCoreMCAsmInfo.cpp
@@ -27,7 +27,6 @@ XCoreMCAsmInfo::XCoreMCAsmInfo(const Triple &TT, const MCTargetOptions &Options)
ProtectedVisibilityAttr = MCSA_Invalid;
// Debug
- ExceptionsType = ExceptionHandling::DwarfCFI;
DwarfRegNumForCFI = true;
UseIntegratedAssembler = false;
diff --git a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCAsmInfo.cpp b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCAsmInfo.cpp
index 4fd924bfcf9430..be21095e164f2d 100644
--- a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCAsmInfo.cpp
+++ b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCAsmInfo.cpp
@@ -36,7 +36,6 @@ XtensaMCAsmInfo::XtensaMCAsmInfo(const Triple &TT,
GlobalDirective = "\t.global\t";
UsesELFSectionDirectiveForBSS = true;
SupportsDebugInformation = true;
- ExceptionsType = ExceptionHandling::DwarfCFI;
AlignmentIsInBytes = false;
initializeAtSpecifiers(atSpecifiers);
More information about the llvm-branch-commits
mailing list