Skip to content

Commit c0ce9ad

Browse files
authored
[llvm] remove incorrect LLVM_ABI annotation usage (#144606)
## Overview This patch removes incorrect usage of `LLVM_ABI` macros that break the (currently incomplete) LLVM Windows DLL build. - ec71d80 added `LLVM_ABI` to template methods fully declared in a header file - 254a92d added `LLVM_ABI` to members of a class already annotated with `LLVM_ABI` # Background Documentation for `LLVM_ABI` and related annotations is found in the LLVM repo [here](https://github.com/llvm/llvm-project/blob/main/llvm/docs/InterfaceExportAnnotations.rst).
1 parent 10b61fe commit c0ce9ad

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

llvm/include/llvm/CodeGen/MachineScheduler.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ createCopyConstrainDAGMutation(const TargetInstrInfo *TII,
14031403
/// default scheduler if the target does not set a default.
14041404
/// Adds default DAG mutations.
14051405
template <typename Strategy = GenericScheduler>
1406-
LLVM_ABI ScheduleDAGMILive *createSchedLive(MachineSchedContext *C) {
1406+
ScheduleDAGMILive *createSchedLive(MachineSchedContext *C) {
14071407
ScheduleDAGMILive *DAG =
14081408
new ScheduleDAGMILive(C, std::make_unique<Strategy>(C));
14091409
// Register DAG post-processors.
@@ -1423,7 +1423,7 @@ LLVM_ABI ScheduleDAGMILive *createSchedLive(MachineSchedContext *C) {
14231423

14241424
/// Create a generic scheduler with no vreg liveness or DAG mutation passes.
14251425
template <typename Strategy = PostGenericScheduler>
1426-
LLVM_ABI ScheduleDAGMI *createSchedPostRA(MachineSchedContext *C) {
1426+
ScheduleDAGMI *createSchedPostRA(MachineSchedContext *C) {
14271427
ScheduleDAGMI *DAG = new ScheduleDAGMI(C, std::make_unique<Strategy>(C),
14281428
/*RemoveKillFlags=*/true);
14291429
const TargetSubtargetInfo &STI = C->MF->getSubtarget();

llvm/include/llvm/MC/MCExpr.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,10 @@ class LLVM_ABI MCSpecifierExpr : public MCExpr {
514514
: MCExpr(Specifier, Loc), Expr(Expr), specifier(S) {}
515515

516516
public:
517-
LLVM_ABI static const MCSpecifierExpr *
518-
create(const MCExpr *Expr, Spec S, MCContext &Ctx, SMLoc Loc = SMLoc());
519-
LLVM_ABI static const MCSpecifierExpr *
520-
create(const MCSymbol *Sym, Spec S, MCContext &Ctx, SMLoc Loc = SMLoc());
517+
static const MCSpecifierExpr *create(const MCExpr *Expr, Spec S,
518+
MCContext &Ctx, SMLoc Loc = SMLoc());
519+
static const MCSpecifierExpr *create(const MCSymbol *Sym, Spec S,
520+
MCContext &Ctx, SMLoc Loc = SMLoc());
521521

522522
Spec getSpecifier() const { return specifier; }
523523
const MCExpr *getSubExpr() const { return Expr; }

0 commit comments

Comments
 (0)