From 52286033872cbc139ba767d31238c5a89c85341c Mon Sep 17 00:00:00 2001 From: Ahmed Bougacha Date: Thu, 15 Dec 2016 18:45:30 +0000 Subject: [PATCH] [GlobalISel] Drop workaround for Legalizer member/class sharing a name. NFC. MachineLegalizer used to be the name of both the class and the member, causing GCC errors. r276522 fixed that by renaming the member to just 'Legalizer'. The 'class' workaround isn't necessary anymore; drop it. llvm-svn: 289848 --- llvm/lib/Target/AArch64/AArch64TargetMachine.cpp | 2 +- llvm/lib/Target/ARM/ARMTargetMachine.cpp | 2 +- llvm/lib/Target/X86/X86TargetMachine.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp index b84abc795d9a..e4ef0d4bb8db 100644 --- a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp +++ b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp @@ -217,7 +217,7 @@ struct AArch64GISelActualAccessor : public GISelAccessor { const InstructionSelector *getInstructionSelector() const override { return InstSelector.get(); } - const class LegalizerInfo *getLegalizerInfo() const override { + const LegalizerInfo *getLegalizerInfo() const override { return Legalizer.get(); } const RegisterBankInfo *getRegBankInfo() const override { diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index 7c24c2a3dfd5..70c9567d99f8 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -253,7 +253,7 @@ struct ARMGISelActualAccessor : public GISelAccessor { const InstructionSelector *getInstructionSelector() const override { return InstSelector.get(); } - const class LegalizerInfo *getLegalizerInfo() const override { + const LegalizerInfo *getLegalizerInfo() const override { return Legalizer.get(); } const RegisterBankInfo *getRegBankInfo() const override { diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index 6eb96a5e184e..50b7eca7d940 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/lib/Target/X86/X86TargetMachine.cpp @@ -190,7 +190,7 @@ struct X86GISelActualAccessor : public GISelAccessor { //TODO: Implement return nullptr; } - const class LegalizerInfo *getLegalizerInfo() const override { + const LegalizerInfo *getLegalizerInfo() const override { //TODO: Implement return nullptr; }