[llvm] r276522 - Fix a GCC error due to this member name also being a type name. This

Chandler Carruth via llvm-commits llvm-commits at lists.llvm.org
Sat Jul 23 00:50:05 PDT 2016


Author: chandlerc
Date: Sat Jul 23 02:50:05 2016
New Revision: 276522

URL: http://llvm.org/viewvc/llvm-project?rev=276522&view=rev
Log:
Fix a GCC error due to this member name also being a type name. This
should fix the build with GCC 4.9 at least. Not sure if this is the
right name or fix, but I've followed up on the original commit.

Modified:
    llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp

Modified: llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp?rev=276522&r1=276521&r2=276522&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp Sat Jul 23 02:50:05 2016
@@ -198,13 +198,13 @@ AArch64TargetMachine::~AArch64TargetMach
 namespace {
 struct AArch64GISelActualAccessor : public GISelAccessor {
   std::unique_ptr<CallLowering> CallLoweringInfo;
-  std::unique_ptr<MachineLegalizer> MachineLegalizer;
+  std::unique_ptr<MachineLegalizer> Legalizer;
   std::unique_ptr<RegisterBankInfo> RegBankInfo;
   const CallLowering *getCallLowering() const override {
     return CallLoweringInfo.get();
   }
   const class MachineLegalizer *getMachineLegalizer() const override {
-    return MachineLegalizer.get();
+    return Legalizer.get();
   }
   const RegisterBankInfo *getRegBankInfo() const override {
     return RegBankInfo.get();
@@ -240,7 +240,7 @@ AArch64TargetMachine::getSubtargetImpl(c
         new AArch64GISelActualAccessor();
     GISel->CallLoweringInfo.reset(
         new AArch64CallLowering(*I->getTargetLowering()));
-    GISel->MachineLegalizer.reset(new AArch64MachineLegalizer());
+    GISel->Legalizer.reset(new AArch64MachineLegalizer());
     GISel->RegBankInfo.reset(
         new AArch64RegisterBankInfo(*I->getRegisterInfo()));
 #endif




More information about the llvm-commits mailing list