[llvm] [win] NFC: Rename `EHCatchret` to `EHCont` to allow for EH Continuation targets that aren't `catchret` instructions (PR #129953)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 5 14:58:40 PST 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-llvm-selectiondag
@llvm/pr-subscribers-backend-hexagon
Author: Daniel Paoliello (dpaoliello)
<details>
<summary>Changes</summary>
This change splits out the renaming and comment updates from #<!-- -->129612 as a non-functional change.
---
Patch is 53.12 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/129953.diff
73 Files Affected:
- (modified) llvm/include/llvm/CodeGen/MIRYamlMapping.h (+2-2)
- (modified) llvm/include/llvm/CodeGen/MachineBasicBlock.h (+10-10)
- (modified) llvm/include/llvm/CodeGen/MachineFunction.h (+13-15)
- (modified) llvm/include/llvm/CodeGen/Passes.h (+3-3)
- (modified) llvm/include/llvm/InitializePasses.h (+1-1)
- (modified) llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (+2-2)
- (modified) llvm/lib/CodeGen/AsmPrinter/WinException.cpp (+4-4)
- (modified) llvm/lib/CodeGen/CMakeLists.txt (+1-1)
- (renamed) llvm/lib/CodeGen/EHContGuardTargets.cpp (+21-21)
- (modified) llvm/lib/CodeGen/MIRParser/MIRParser.cpp (+1-1)
- (modified) llvm/lib/CodeGen/MIRPrinter.cpp (+1-1)
- (modified) llvm/lib/CodeGen/MachineBasicBlock.cpp (+4-4)
- (modified) llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (+2-2)
- (modified) llvm/lib/Target/AArch64/AArch64TargetMachine.cpp (+1-1)
- (modified) llvm/lib/Target/ARM/ARMTargetMachine.cpp (+1-1)
- (modified) llvm/lib/Target/X86/X86TargetMachine.cpp (+1-1)
- (modified) llvm/test/CodeGen/AArch64/GlobalISel/store-merging-debug.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/cfi-fixup-multi-block-prologue.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/emit_fneg_with_non_register_operand.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/machine-latecleanup-inlineasm.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/nested-iv-regalloc.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/regalloc-last-chance-recolor-with-split.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/sink-and-fold-drop-dbg.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/sink-and-fold-illegal-shift.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/sink-and-fold-preserve-debugloc.mir (+2-2)
- (modified) llvm/test/CodeGen/AArch64/split-deadloop.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/stack-probing-last-in-block.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/tail-dup-redundant-phi.mir (+1-1)
- (modified) llvm/test/CodeGen/AArch64/wineh9.mir (+1-1)
- (modified) llvm/test/CodeGen/ARM/execute-only-save-cpsr.mir (+4-4)
- (modified) llvm/test/CodeGen/ARM/inlineasmbr-if-cvt.mir (+1-1)
- (modified) llvm/test/CodeGen/ARM/jump-table-dbg-value.mir (+1-1)
- (modified) llvm/test/CodeGen/Hexagon/cext-opt-block-addr.mir (+2-2)
- (modified) llvm/test/CodeGen/Hexagon/rdf-copy-clobber.mir (+1-1)
- (modified) llvm/test/CodeGen/Hexagon/rdf-phi-clobber.mir (+1-1)
- (modified) llvm/test/CodeGen/MIR/Hexagon/addrmode-opt-nonreaching.mir (+1-1)
- (modified) llvm/test/CodeGen/MIR/X86/exception-function-state.mir (+8-8)
- (modified) llvm/test/CodeGen/MIR/X86/inline-asm-rm-exhaustion.mir (+3-3)
- (modified) llvm/test/CodeGen/NVPTX/proxy-reg-erasure.mir (+1-1)
- (modified) llvm/test/CodeGen/PowerPC/ctrloop-do-not-duplicate-mi.mir (+1-1)
- (modified) llvm/test/CodeGen/PowerPC/peephole-replaceInstr-after-eliminate-extsw.mir (+1-1)
- (modified) llvm/test/CodeGen/RISCV/rvv/undef-earlyclobber-chain.mir (+1-1)
- (modified) llvm/test/CodeGen/RISCV/stack-slot-coloring.mir (+1-1)
- (modified) llvm/test/CodeGen/Thumb2/LowOverheadLoops/mve-reduct-livein-arg.mir (+1-1)
- (modified) llvm/test/CodeGen/Thumb2/constant-islands-no-split.mir (+1-1)
- (modified) llvm/test/CodeGen/Thumb2/pipeliner-preserve-ties.mir (+1-1)
- (modified) llvm/test/CodeGen/WebAssembly/multivalue-dont-move-def-past-use.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/align-basic-block-sections.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/amx_tile_pair_configure_O0.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/amx_tile_pair_configure_O2.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/amx_tile_pair_copy.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/amx_tile_pair_preconfigure_O0.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/amx_tile_pair_preconfigure_O2.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/apx/domain-reassignment.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/apx/memfold-nd2rmw.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/basic-block-address-map-mir-parse.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/break-false-dep-crash.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/callbr-asm-outputs-regallocfast.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/cse-two-preds.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/domain-reassignment.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/machine-licm-vs-wineh.mir (+1-1)
- (modified) llvm/test/CodeGen/X86/peephole-test-after-add.mir (+3-3)
- (modified) llvm/test/CodeGen/X86/zero-call-used-regs-debug-info.mir (+1-1)
- (modified) llvm/test/DebugInfo/ARM/move-dbg-values-imm-test.mir (+1-1)
- (modified) llvm/test/DebugInfo/MIR/X86/instr-ref-join-def-vphi.mir (+1-1)
- (modified) llvm/test/DebugInfo/X86/instr-ref-track-clobbers.mir (+1-1)
- (modified) llvm/test/MachineVerifier/verify-inlineasmbr.mir (+1-1)
- (modified) llvm/test/tools/UpdateTestChecks/update_mir_test_checks/Inputs/x86-MIFlags.mir (+1-1)
- (modified) llvm/test/tools/UpdateTestChecks/update_mir_test_checks/Inputs/x86-MIFlags.mir.expected (+1-1)
- (modified) llvm/test/tools/llvm-reduce/mir/preserve-func-info.mir (+2-2)
- (modified) llvm/tools/llvm-reduce/ReducerWorkItem.cpp (+3-4)
- (modified) llvm/unittests/CodeGen/DroppedVariableStatsMIRTest.cpp (+7-7)
- (modified) llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn (+1-1)
``````````diff
diff --git a/llvm/include/llvm/CodeGen/MIRYamlMapping.h b/llvm/include/llvm/CodeGen/MIRYamlMapping.h
index dbad3469d047d..119786f045ed9 100644
--- a/llvm/include/llvm/CodeGen/MIRYamlMapping.h
+++ b/llvm/include/llvm/CodeGen/MIRYamlMapping.h
@@ -762,7 +762,7 @@ struct MachineFunction {
bool CallsEHReturn = false;
bool CallsUnwindInit = false;
- bool HasEHCatchret = false;
+ bool HasEHContTarget = false;
bool HasEHScopes = false;
bool HasEHFunclets = false;
bool IsOutlined = false;
@@ -810,7 +810,7 @@ template <> struct MappingTraits<MachineFunction> {
YamlIO.mapOptional("callsEHReturn", MF.CallsEHReturn, false);
YamlIO.mapOptional("callsUnwindInit", MF.CallsUnwindInit, false);
- YamlIO.mapOptional("hasEHCatchret", MF.HasEHCatchret, false);
+ YamlIO.mapOptional("hasEHContTarget", MF.HasEHContTarget, false);
YamlIO.mapOptional("hasEHScopes", MF.HasEHScopes, false);
YamlIO.mapOptional("hasEHFunclets", MF.HasEHFunclets, false);
YamlIO.mapOptional("isOutlined", MF.IsOutlined, false);
diff --git a/llvm/include/llvm/CodeGen/MachineBasicBlock.h b/llvm/include/llvm/CodeGen/MachineBasicBlock.h
index 2de96fa85b936..0d105488ee2db 100644
--- a/llvm/include/llvm/CodeGen/MachineBasicBlock.h
+++ b/llvm/include/llvm/CodeGen/MachineBasicBlock.h
@@ -205,8 +205,8 @@ class MachineBasicBlock
/// LLVM IR.
bool IsEHScopeEntry = false;
- /// Indicates if this is a target block of a catchret.
- bool IsEHCatchretTarget = false;
+ /// Indicates if this is a target of Windows EH Continuation Guard.
+ bool IsEHContTarget = false;
/// Indicate that this basic block is the entry block of an EH funclet.
bool IsEHFuncletEntry = false;
@@ -234,8 +234,8 @@ class MachineBasicBlock
/// is only computed once and is cached.
mutable MCSymbol *CachedMCSymbol = nullptr;
- /// Cached MCSymbol for this block (used if IsEHCatchRetTarget).
- mutable MCSymbol *CachedEHCatchretMCSymbol = nullptr;
+ /// Cached MCSymbol for this block (used if IsEHContTarget).
+ mutable MCSymbol *CachedEHContMCSymbol = nullptr;
/// Marks the end of the basic block. Used during basic block sections to
/// calculate the size of the basic block, or the BB section ending with it.
@@ -652,11 +652,11 @@ class MachineBasicBlock
/// that used to have a catchpad or cleanuppad instruction in the LLVM IR.
void setIsEHScopeEntry(bool V = true) { IsEHScopeEntry = V; }
- /// Returns true if this is a target block of a catchret.
- bool isEHCatchretTarget() const { return IsEHCatchretTarget; }
+ /// Returns true if this is a target of Windows EH Continuation Guard.
+ bool isEHContTarget() const { return IsEHContTarget; }
- /// Indicates if this is a target block of a catchret.
- void setIsEHCatchretTarget(bool V = true) { IsEHCatchretTarget = V; }
+ /// Indicates if this is a target of Windows EH Continuation Guard.
+ void setIsEHContTarget(bool V = true) { IsEHContTarget = V; }
/// Returns true if this is the entry block of an EH funclet.
bool isEHFuncletEntry() const { return IsEHFuncletEntry; }
@@ -1238,8 +1238,8 @@ class MachineBasicBlock
/// Return the MCSymbol for this basic block.
MCSymbol *getSymbol() const;
- /// Return the EHCatchret Symbol for this basic block.
- MCSymbol *getEHCatchretSymbol() const;
+ /// Return the Windows EH Continuation Symbol for this basic block.
+ MCSymbol *getEHContSymbol() const;
std::optional<uint64_t> getIrrLoopHeaderWeight() const {
return IrrLoopHeaderWeight;
diff --git a/llvm/include/llvm/CodeGen/MachineFunction.h b/llvm/include/llvm/CodeGen/MachineFunction.h
index 408428fe28a32..9a4d990bd0afa 100644
--- a/llvm/include/llvm/CodeGen/MachineFunction.h
+++ b/llvm/include/llvm/CodeGen/MachineFunction.h
@@ -359,9 +359,9 @@ class LLVM_ABI MachineFunction {
/// construct a table of valid longjmp targets for Windows Control Flow Guard.
std::vector<MCSymbol *> LongjmpTargets;
- /// List of basic blocks that are the target of catchrets. Used to construct
- /// a table of valid targets for Windows EHCont Guard.
- std::vector<MCSymbol *> CatchretTargets;
+ /// List of basic blocks that are the targets for Windows EH Continuation
+ /// Guard.
+ std::vector<MCSymbol *> EHContTargets;
/// \name Exception Handling
/// \{
@@ -383,7 +383,7 @@ class LLVM_ABI MachineFunction {
bool CallsEHReturn = false;
bool CallsUnwindInit = false;
- bool HasEHCatchret = false;
+ bool HasEHContTarget = false;
bool HasEHScopes = false;
bool HasEHFunclets = false;
bool HasFakeUses = false;
@@ -1197,17 +1197,15 @@ class LLVM_ABI MachineFunction {
/// Control Flow Guard.
void addLongjmpTarget(MCSymbol *Target) { LongjmpTargets.push_back(Target); }
- /// Returns a reference to a list of symbols that we have catchrets.
- /// Used to construct the catchret target table used by Windows EHCont Guard.
- const std::vector<MCSymbol *> &getCatchretTargets() const {
- return CatchretTargets;
+ /// Returns a reference to a list of symbols that are targets for Windows
+ /// EH Continuation Guard.
+ const std::vector<MCSymbol *> &getEHContTargets() const {
+ return EHContTargets;
}
- /// Add the specified symbol to the list of valid catchret targets for Windows
- /// EHCont Guard.
- void addCatchretTarget(MCSymbol *Target) {
- CatchretTargets.push_back(Target);
- }
+ /// Add the specified symbol to the list of targets for Windows EH
+ /// Continuation Guard.
+ void addEHContTarget(MCSymbol *Target) { EHContTargets.push_back(Target); }
/// Tries to get the global and target flags for a call site, if the
/// instruction is a call to a global.
@@ -1236,8 +1234,8 @@ class LLVM_ABI MachineFunction {
bool callsUnwindInit() const { return CallsUnwindInit; }
void setCallsUnwindInit(bool b) { CallsUnwindInit = b; }
- bool hasEHCatchret() const { return HasEHCatchret; }
- void setHasEHCatchret(bool V) { HasEHCatchret = V; }
+ bool hasEHContTarget() const { return HasEHContTarget; }
+ void setHasEHContTarget(bool V) { HasEHContTarget = V; }
bool hasEHScopes() const { return HasEHScopes; }
void setHasEHScopes(bool V) { HasEHScopes = V; }
diff --git a/llvm/include/llvm/CodeGen/Passes.h b/llvm/include/llvm/CodeGen/Passes.h
index 5fa67a29ddbb6..dbd61d6b2b2a8 100644
--- a/llvm/include/llvm/CodeGen/Passes.h
+++ b/llvm/include/llvm/CodeGen/Passes.h
@@ -550,9 +550,9 @@ namespace llvm {
/// \see CFGuardLongjmp.cpp
FunctionPass *createCFGuardLongjmpPass();
- /// Creates EHContGuard catchret target identification pass.
- /// \see EHContGuardCatchret.cpp
- FunctionPass *createEHContGuardCatchretPass();
+ /// Creates Windows EH Continuation Guard target identification pass.
+ /// \see EHContGuardTargets.cpp
+ FunctionPass *createEHContGuardTargetsPass();
/// Create Hardware Loop pass. \see HardwareLoops.cpp
FunctionPass *createHardwareLoopsLegacyPass();
diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h
index c2cb4cb4ef477..a05e876806ab5 100644
--- a/llvm/include/llvm/InitializePasses.h
+++ b/llvm/include/llvm/InitializePasses.h
@@ -104,7 +104,7 @@ void initializeEarlyIfPredicatorPass(PassRegistry &);
void initializeEarlyMachineLICMPass(PassRegistry &);
void initializeEarlyTailDuplicateLegacyPass(PassRegistry &);
void initializeEdgeBundlesWrapperLegacyPass(PassRegistry &);
-void initializeEHContGuardCatchretPass(PassRegistry &);
+void initializeEHContGuardTargetsPass(PassRegistry &);
void initializeExpandLargeFpConvertLegacyPassPass(PassRegistry &);
void initializeExpandLargeDivRemLegacyPassPass(PassRegistry &);
void initializeExpandMemCmpLegacyPassPass(PassRegistry &);
diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 6f39bff80abda..6d99cb3a516cc 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -4288,9 +4288,9 @@ void AsmPrinter::emitBasicBlockStart(const MachineBasicBlock &MBB) {
}
}
- if (MBB.isEHCatchretTarget() &&
+ if (MBB.isEHContTarget() &&
MAI->getExceptionHandlingType() == ExceptionHandling::WinEH) {
- OutStreamer->emitLabel(MBB.getEHCatchretSymbol());
+ OutStreamer->emitLabel(MBB.getEHContSymbol());
}
// With BB sections, each basic block must handle CFI information on its own
diff --git a/llvm/lib/CodeGen/AsmPrinter/WinException.cpp b/llvm/lib/CodeGen/AsmPrinter/WinException.cpp
index 97b4a6a42d81d..d51ac2ac89f35 100644
--- a/llvm/lib/CodeGen/AsmPrinter/WinException.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/WinException.cpp
@@ -160,10 +160,10 @@ void WinException::endFunction(const MachineFunction *MF) {
Asm->OutStreamer->popSection();
}
- if (!MF->getCatchretTargets().empty()) {
- // Copy the function's catchret targets to a module-level list.
- EHContTargets.insert(EHContTargets.end(), MF->getCatchretTargets().begin(),
- MF->getCatchretTargets().end());
+ if (!MF->getEHContTargets().empty()) {
+ // Copy the function's EH Continuation targets to a module-level list.
+ EHContTargets.insert(EHContTargets.end(), MF->getEHContTargets().begin(),
+ MF->getEHContTargets().end());
}
}
diff --git a/llvm/lib/CodeGen/CMakeLists.txt b/llvm/lib/CodeGen/CMakeLists.txt
index 23ec3310079d3..0c92637a75e77 100644
--- a/llvm/lib/CodeGen/CMakeLists.txt
+++ b/llvm/lib/CodeGen/CMakeLists.txt
@@ -54,7 +54,7 @@ add_llvm_component_library(LLVMCodeGen
DwarfEHPrepare.cpp
EarlyIfConversion.cpp
EdgeBundles.cpp
- EHContGuardCatchret.cpp
+ EHContGuardTargets.cpp
ExecutionDomainFix.cpp
ExpandLargeDivRem.cpp
ExpandLargeFpConvert.cpp
diff --git a/llvm/lib/CodeGen/EHContGuardCatchret.cpp b/llvm/lib/CodeGen/EHContGuardTargets.cpp
similarity index 56%
rename from llvm/lib/CodeGen/EHContGuardCatchret.cpp
rename to llvm/lib/CodeGen/EHContGuardTargets.cpp
index cd1cdb0653618..94d3b42b7b90b 100644
--- a/llvm/lib/CodeGen/EHContGuardCatchret.cpp
+++ b/llvm/lib/CodeGen/EHContGuardTargets.cpp
@@ -1,4 +1,4 @@
-//===-- EHContGuardCatchret.cpp - Catchret target symbols -------*- C++ -*-===//
+//===-- EHContGuardTargets.cpp - EH continuation target symbols -*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -8,9 +8,10 @@
///
/// \file
/// This file contains a machine function pass to insert a symbol before each
-/// valid catchret target and store this in the MachineFunction's
-/// CatchRetTargets vector. This will be used to emit the table of valid targets
-/// used by EHCont Guard.
+/// valid target where the unwinder in Windows may continue exectution after an
+/// exception is thrown and store this in the MachineFunction's EHContTargets
+/// vector. This will be used to emit the table of valid targets used by Windows
+/// EH Continuation Guard.
///
//===----------------------------------------------------------------------===//
@@ -26,19 +27,18 @@ using namespace llvm;
#define DEBUG_TYPE "ehcontguard-catchret"
-STATISTIC(EHContGuardCatchretTargets,
- "Number of EHCont Guard catchret targets");
+STATISTIC(EHContGuardTargetsFound, "Number of EHCont Guard targets");
namespace {
/// MachineFunction pass to insert a symbol before each valid catchret target
/// and store these in the MachineFunction's CatchRetTargets vector.
-class EHContGuardCatchret : public MachineFunctionPass {
+class EHContGuardTargets : public MachineFunctionPass {
public:
static char ID;
- EHContGuardCatchret() : MachineFunctionPass(ID) {
- initializeEHContGuardCatchretPass(*PassRegistry::getPassRegistry());
+ EHContGuardTargets() : MachineFunctionPass(ID) {
+ initializeEHContGuardTargetsPass(*PassRegistry::getPassRegistry());
}
StringRef getPassName() const override {
@@ -50,31 +50,31 @@ class EHContGuardCatchret : public MachineFunctionPass {
} // end anonymous namespace
-char EHContGuardCatchret::ID = 0;
+char EHContGuardTargets::ID = 0;
-INITIALIZE_PASS(EHContGuardCatchret, "EHContGuardCatchret",
- "Insert symbols at valid catchret targets for /guard:ehcont",
- false, false)
-FunctionPass *llvm::createEHContGuardCatchretPass() {
- return new EHContGuardCatchret();
+INITIALIZE_PASS(EHContGuardTargets, "EHContGuardTargets",
+ "Insert symbols at valid targets for /guard:ehcont", false,
+ false)
+FunctionPass *llvm::createEHContGuardTargetsPass() {
+ return new EHContGuardTargets();
}
-bool EHContGuardCatchret::runOnMachineFunction(MachineFunction &MF) {
+bool EHContGuardTargets::runOnMachineFunction(MachineFunction &MF) {
// Skip modules for which the ehcontguard flag is not set.
if (!MF.getFunction().getParent()->getModuleFlag("ehcontguard"))
return false;
- // Skip functions that do not have catchret
- if (!MF.hasEHCatchret())
+ // Skip functions that do not have targets
+ if (!MF.hasEHContTarget())
return false;
bool Result = false;
for (MachineBasicBlock &MBB : MF) {
- if (MBB.isEHCatchretTarget()) {
- MF.addCatchretTarget(MBB.getEHCatchretSymbol());
- EHContGuardCatchretTargets++;
+ if (MBB.isEHContTarget()) {
+ MF.addEHContTarget(MBB.getEHContSymbol());
+ EHContGuardTargetsFound++;
Result = true;
}
}
diff --git a/llvm/lib/CodeGen/MIRParser/MIRParser.cpp b/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
index b195683051c90..905c1cfa2dc46 100644
--- a/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
+++ b/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
@@ -551,7 +551,7 @@ MIRParserImpl::initializeMachineFunction(const yaml::MachineFunction &YamlMF,
MF.setCallsEHReturn(YamlMF.CallsEHReturn);
MF.setCallsUnwindInit(YamlMF.CallsUnwindInit);
- MF.setHasEHCatchret(YamlMF.HasEHCatchret);
+ MF.setHasEHContTarget(YamlMF.HasEHContTarget);
MF.setHasEHScopes(YamlMF.HasEHScopes);
MF.setHasEHFunclets(YamlMF.HasEHFunclets);
MF.setIsOutlined(YamlMF.IsOutlined);
diff --git a/llvm/lib/CodeGen/MIRPrinter.cpp b/llvm/lib/CodeGen/MIRPrinter.cpp
index 96ba475f93844..e9bd60e4e2597 100644
--- a/llvm/lib/CodeGen/MIRPrinter.cpp
+++ b/llvm/lib/CodeGen/MIRPrinter.cpp
@@ -208,7 +208,7 @@ void MIRPrinter::print(const MachineFunction &MF) {
YamlMF.CallsEHReturn = MF.callsEHReturn();
YamlMF.CallsUnwindInit = MF.callsUnwindInit();
- YamlMF.HasEHCatchret = MF.hasEHCatchret();
+ YamlMF.HasEHContTarget = MF.hasEHContTarget();
YamlMF.HasEHScopes = MF.hasEHScopes();
YamlMF.HasEHFunclets = MF.hasEHFunclets();
YamlMF.HasFakeUses = MF.hasFakeUses();
diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp
index b3a71d1144726..fa6b53455f145 100644
--- a/llvm/lib/CodeGen/MachineBasicBlock.cpp
+++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp
@@ -92,15 +92,15 @@ MCSymbol *MachineBasicBlock::getSymbol() const {
return CachedMCSymbol;
}
-MCSymbol *MachineBasicBlock::getEHCatchretSymbol() const {
- if (!CachedEHCatchretMCSymbol) {
+MCSymbol *MachineBasicBlock::getEHContSymbol() const {
+ if (!CachedEHContMCSymbol) {
const MachineFunction *MF = getParent();
SmallString<128> SymbolName;
raw_svector_ostream(SymbolName)
<< "$ehgcr_" << MF->getFunctionNumber() << '_' << getNumber();
- CachedEHCatchretMCSymbol = MF->getContext().getOrCreateSymbol(SymbolName);
+ CachedEHContMCSymbol = MF->getContext().getOrCreateSymbol(SymbolName);
}
- return CachedEHCatchretMCSymbol;
+ return CachedEHContMCSymbol;
}
MCSymbol *MachineBasicBlock::getEndSymbol() const {
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index d5a07e616236e..d2df323fce638 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -1981,8 +1981,8 @@ void SelectionDAGBuilder::visitCatchRet(const CatchReturnInst &I) {
// Update machine-CFG edge.
MachineBasicBlock *TargetMBB = FuncInfo.getMBB(I.getSuccessor());
FuncInfo.MBB->addSuccessor(TargetMBB);
- TargetMBB->setIsEHCatchretTarget(true);
- DAG.getMachineFunction().setHasEHCatchret(true);
+ TargetMBB->setIsEHContTarget(true);
+ DAG.getMachineFunction().setHasEHContTarget(true);
auto Pers = classifyEHPersonality(FuncInfo.Fn->getPersonalityFn());
bool IsSEH = isAsynchronousEHPersonality(Pers);
diff --git a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
index d10a0c0a08f89..5c514bf02968a 100644
--- a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
+++ b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
@@ -869,7 +869,7 @@ void AArch64PassConfig::addPreEmitPass() {
// Identify valid longjmp targets for Windows Control Flow Guard.
addPass(createCFGuardLongjmpPass());
// Identify valid eh continuation targets for Windows EHCont Guard.
- addPass(createEHContGuardCatchretPass());
+ addPass(createEHContGuardTargetsPass());
}
if (TM->getOptLevel() != CodeGenOptLevel::None && EnableCollectLOH &&
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
index 98bdf310dea91..a0d56704305a3 100644
--- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
@@ -620,7 +620,7 @@ void ARMPassConfig::addPreEmitPass2() {
// Identify valid longjmp targets for Windows Control Flow Guard.
addPass(createCFGuardLongjmpPass());
// Identify valid eh continuation targets for Windows EHCont Guard.
- addPass(createEHContGuardCatchretPass());
+ addPass(createEHContGuardTargetsPass());
}
}
diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp
index 0430279b88984..4cecbbf27aa30 100644
--- a/llvm/lib/Target/X86/X86TargetMachine.cpp
+++ b/llvm/lib/Target/X86/X86TargetMachine.cpp
@@ -647,7 +647,7 @@ void X86PassConfig::addPreEmitPass2() {
// Identify valid longjmp targets for Windows Control Flow Guard.
addPass(createCFGuardLongjmpPass());
// Identify valid eh continuation targets for Windows EHCont Guard.
- addPass(createEHContGuardCatchretPass());
+ addPass(createEHContGuardTargetsPass());
}
addPass(createX86LoadValueInjectionRetHardeningPass());
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/store-merging-debug.mir b/llvm/test/CodeGen/AArch64/GlobalISel/store-merging-debug.mir
index d52ef0f3da74c..2f4dbb7d47af5 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/store-merging-debug.mir
+++ b/llvm/test/CodeGen/AArch64/GlobalISel/store-merging-debug.mir
@@ -48,7 +48,7 @@ tracksRegLiveness: true
hasWinCFI: false
callsEHReturn: false
callsUnwindInit: false
-hasEHCatchret: false
+hasEHContTarget: false
hasEHScopes: false
hasEHFunclets: false
failsVerification: false
diff --git a/llvm/test/CodeGen/AArch64/cfi-fixup-multi-block-prologue.mir b/llvm/test/CodeGen/AArch64/cfi-fixup-multi-block-prologue.mir
index 31fa3832367be..1ec18b987c1f2 100644
--- a/llvm/test/CodeGen/AArch64/cfi-fixup-multi-block-prologue.mir
+++ b/llvm/test/CodeGen/AArch64/cfi-fixup-multi-block-prologue.mir
@@ -51,7 +51,7 @@ tracksRegLiveness: true
hasWinCFI: false
callsEHReturn: false
callsUnwindInit: false
-hasEHCatchret: false
+hasEHContTarget: false
hasEHScopes: false
hasEHFunclets: false
isOutlined: false
diff --git a/llvm/test/CodeGen/AArch64/emit_fneg_with_non_register_operand.mir b/llvm/test/CodeGen/AArch64/emit_fneg_with_non_register_operand.mir
index f9878adfe5e44..253e6a9c076c6 100644
--- a/llvm/test/CodeGen/AArch64/emit_fneg_with_non_register_operand.mir
+++ b/llvm/test/CodeGen/AArch64/emit_fneg_with_non_register_operand.mir
@@ -39,7 +39,7 @@ tracksRegLiveness: true
hasWinCFI: false
callsEHReturn: false
callsUnwindInit: false
-hasEHCatchret: false
+hasEHContTarget: false
hasEHScopes: false
hasEHFunclets: false
isOutlined: false
diff --git a/llvm/test/CodeGen/AArch64/machine-latecleanup-inlineasm.mir b/llvm/test/CodeGen/AArch64/machine-latecleanup-inlineasm.mir
index 9a8e5c6341bca..c5f871a37d5f6 100644
--- a/llvm/test/CodeGen/AArch64/machine-latecleanup-inlineasm.mir
+++ b/llvm/test/CodeGen/AArch64/machine-latecleanup-inlineasm.mir
@@ -56,7 +56,7 @@ tracksRegLiveness: true
hasWinCFI: false
callsEHReturn: false
callsUnwindIni...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/129953
More information about the llvm-commits
mailing list