summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2016-07-23 07:50:05 +0000
committerChandler Carruth <chandlerc@gmail.com>2016-07-23 07:50:05 +0000
commit488cb137a98201afc20a29a389a61f87bda69020 (patch)
tree1d20ed5916217c4d0e5567abebff792ef12c1524
parentb6519db90dcb422020fcc7e78f655ad2f3821453 (diff)
downloadbcm5719-llvm-488cb137a98201afc20a29a389a61f87bda69020.tar.gz
bcm5719-llvm-488cb137a98201afc20a29a389a61f87bda69020.zip
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. llvm-svn: 276522
-rw-r--r--llvm/lib/Target/AArch64/AArch64TargetMachine.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
index 605fb579d7b..6107e6c94db 100644
--- a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
+++ b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
@@ -198,13 +198,13 @@ AArch64TargetMachine::~AArch64TargetMachine() {}
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(const Function &F) const {
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
OpenPOWER on IntegriCloud