mirror of
https://github.com/llvm/llvm-project.git
synced 2026-10-26 13:53:31 +08:00
Adds a newPM pass for EHContGuardTargets (eh-cont-guard-targets). - Extracts the pass's logic (which has no per-instance state) into a shared runEHContGuardTargets free function, called by both the legacy pass and the new pass manager pass. - Renames the old pass with the "Legacy" suffix, and (matching the same convention already applied to CFIInstrInserter) renames createEHContGuardTargetsPass() to createEHContGuardTargetsLegacy() at all three legacy call sites (X86, AArch64, ARM). - Adds the new pass manager pass EHContGuardTargetsPass, using RequiredPassInfoMixin: the legacy pass's runOnMachineFunction never calls skipFunction, so it always runs unconditionally and should not be skippable in the new PM either. - Updates MachinePassRegistry.def and PassBuilder. - Wires the pass into X86's newPM pipeline, replacing an existing TODO inside the already-correct TT.isOSWindows() conditional in X86CodeGenPassBuilder.cpp. AArch64 and ARM have no newPM CodeGenPassBuilder yet (legacy-only), so no wiring was needed there. - Adds a -enable-new-pm RUN line to ehcontguard.ll (X86 only, the only target with newPM support), since no dedicated unit test existed to extend, and updates llc-pipeline-npm.ll's O0-WINDOWS/O3-WINDOWS pipeline-dump expectations (verified empirically where the pass lands in the dump). Assisted-by: Claude Sonnet 5
98 lines
3.0 KiB
C++
98 lines
3.0 KiB
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.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
///
|
|
/// \file
|
|
/// This file contains a machine function pass to insert a symbol before each
|
|
/// 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.
|
|
///
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "llvm/CodeGen/EHContGuardTargets.h"
|
|
#include "llvm/ADT/Statistic.h"
|
|
#include "llvm/CodeGen/MachineBasicBlock.h"
|
|
#include "llvm/CodeGen/MachineFunctionPass.h"
|
|
#include "llvm/CodeGen/MachineModuleInfo.h"
|
|
#include "llvm/CodeGen/Passes.h"
|
|
#include "llvm/IR/Module.h"
|
|
#include "llvm/InitializePasses.h"
|
|
|
|
using namespace llvm;
|
|
|
|
#define DEBUG_TYPE "ehcontguard-catchret"
|
|
|
|
STATISTIC(EHContGuardTargetsFound, "Number of EHCont Guard targets");
|
|
|
|
static bool runEHContGuardTargets(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 targets
|
|
if (!MF.hasEHContTarget())
|
|
return false;
|
|
|
|
bool Result = false;
|
|
|
|
for (MachineBasicBlock &MBB : MF) {
|
|
if (MBB.isEHContTarget()) {
|
|
MF.addEHContTarget(MBB.getEHContSymbol());
|
|
EHContGuardTargetsFound++;
|
|
Result = true;
|
|
}
|
|
}
|
|
|
|
return Result;
|
|
}
|
|
|
|
namespace {
|
|
|
|
/// MachineFunction pass to insert a symbol before each valid catchret target
|
|
/// and store these in the MachineFunction's CatchRetTargets vector.
|
|
class EHContGuardTargetsLegacy : public MachineFunctionPass {
|
|
public:
|
|
static char ID;
|
|
|
|
EHContGuardTargetsLegacy() : MachineFunctionPass(ID) {}
|
|
|
|
StringRef getPassName() const override {
|
|
return "EH Cont Guard catchret targets";
|
|
}
|
|
|
|
void getAnalysisUsage(AnalysisUsage &AU) const override {
|
|
AU.setPreservesCFG();
|
|
MachineFunctionPass::getAnalysisUsage(AU);
|
|
}
|
|
|
|
bool runOnMachineFunction(MachineFunction &MF) override {
|
|
return runEHContGuardTargets(MF);
|
|
}
|
|
};
|
|
|
|
} // end anonymous namespace
|
|
|
|
char EHContGuardTargetsLegacy::ID = 0;
|
|
|
|
INITIALIZE_PASS(EHContGuardTargetsLegacy, "EHContGuardTargets",
|
|
"Insert symbols at valid targets for /guard:ehcont", false,
|
|
false)
|
|
FunctionPass *llvm::createEHContGuardTargetsLegacy() {
|
|
return new EHContGuardTargetsLegacy();
|
|
}
|
|
|
|
PreservedAnalyses
|
|
EHContGuardTargetsPass::run(MachineFunction &MF,
|
|
MachineFunctionAnalysisManager &MFAM) {
|
|
if (!runEHContGuardTargets(MF))
|
|
return PreservedAnalyses::all();
|
|
|
|
return getMachineFunctionPassPreservedAnalyses().preserveSet<CFGAnalyses>();
|
|
}
|