Commit 0f86d03c by John Porto

Removes const qualification for two methods in TargetDataLowering.

Removes const qualifier for TargetDataLowering::lowerGlobals() and TargetDataLowering::lowerConstants() BUG= None R=stichnot@chromium.org Review URL: https://codereview.chromium.org/1177873003.
parent 050deaa6
...@@ -380,9 +380,8 @@ public: ...@@ -380,9 +380,8 @@ public:
static std::unique_ptr<TargetDataLowering> createLowering(GlobalContext *Ctx); static std::unique_ptr<TargetDataLowering> createLowering(GlobalContext *Ctx);
virtual ~TargetDataLowering(); virtual ~TargetDataLowering();
virtual void virtual void lowerGlobals(std::unique_ptr<VariableDeclarationList> Vars) = 0;
lowerGlobals(std::unique_ptr<VariableDeclarationList> Vars) const = 0; virtual void lowerConstants() = 0;
virtual void lowerConstants() const = 0;
protected: protected:
explicit TargetDataLowering(GlobalContext *Ctx) : Ctx(Ctx) {} explicit TargetDataLowering(GlobalContext *Ctx) : Ctx(Ctx) {}
......
...@@ -2200,7 +2200,7 @@ void TargetDataARM32::lowerGlobal(const VariableDeclaration &Var) const { ...@@ -2200,7 +2200,7 @@ void TargetDataARM32::lowerGlobal(const VariableDeclaration &Var) const {
} }
void TargetDataARM32::lowerGlobals( void TargetDataARM32::lowerGlobals(
std::unique_ptr<VariableDeclarationList> Vars) const { std::unique_ptr<VariableDeclarationList> Vars) {
switch (Ctx->getFlags().getOutFileType()) { switch (Ctx->getFlags().getOutFileType()) {
case FT_Elf: { case FT_Elf: {
ELFObjectWriter *Writer = Ctx->getObjectWriter(); ELFObjectWriter *Writer = Ctx->getObjectWriter();
...@@ -2219,7 +2219,7 @@ void TargetDataARM32::lowerGlobals( ...@@ -2219,7 +2219,7 @@ void TargetDataARM32::lowerGlobals(
} }
} }
void TargetDataARM32::lowerConstants() const { void TargetDataARM32::lowerConstants() {
if (Ctx->getFlags().getDisableTranslation()) if (Ctx->getFlags().getDisableTranslation())
return; return;
UnimplementedError(Ctx->getFlags()); UnimplementedError(Ctx->getFlags());
......
...@@ -302,7 +302,7 @@ private: ...@@ -302,7 +302,7 @@ private:
~TargetARM32() override {} ~TargetARM32() override {}
}; };
class TargetDataARM32 : public TargetDataLowering { class TargetDataARM32 final : public TargetDataLowering {
TargetDataARM32() = delete; TargetDataARM32() = delete;
TargetDataARM32(const TargetDataARM32 &) = delete; TargetDataARM32(const TargetDataARM32 &) = delete;
TargetDataARM32 &operator=(const TargetDataARM32 &) = delete; TargetDataARM32 &operator=(const TargetDataARM32 &) = delete;
...@@ -312,8 +312,8 @@ public: ...@@ -312,8 +312,8 @@ public:
return std::unique_ptr<TargetDataLowering>(new TargetDataARM32(Ctx)); return std::unique_ptr<TargetDataLowering>(new TargetDataARM32(Ctx));
} }
void lowerGlobals(std::unique_ptr<VariableDeclarationList> Vars) const final; void lowerGlobals(std::unique_ptr<VariableDeclarationList> Vars) override;
void lowerConstants() const final; void lowerConstants() override;
protected: protected:
explicit TargetDataARM32(GlobalContext *Ctx); explicit TargetDataARM32(GlobalContext *Ctx);
...@@ -334,7 +334,7 @@ public: ...@@ -334,7 +334,7 @@ public:
return std::unique_ptr<TargetHeaderLowering>(new TargetHeaderARM32(Ctx)); return std::unique_ptr<TargetHeaderLowering>(new TargetHeaderARM32(Ctx));
} }
void lower(); void lower() override;
protected: protected:
explicit TargetHeaderARM32(GlobalContext *Ctx); explicit TargetHeaderARM32(GlobalContext *Ctx);
......
...@@ -677,7 +677,7 @@ void TargetDataMIPS32::lowerGlobal(const VariableDeclaration &Var) const { ...@@ -677,7 +677,7 @@ void TargetDataMIPS32::lowerGlobal(const VariableDeclaration &Var) const {
} }
void TargetDataMIPS32::lowerGlobals( void TargetDataMIPS32::lowerGlobals(
std::unique_ptr<VariableDeclarationList> Vars) const { std::unique_ptr<VariableDeclarationList> Vars) {
switch (Ctx->getFlags().getOutFileType()) { switch (Ctx->getFlags().getOutFileType()) {
case FT_Elf: { case FT_Elf: {
ELFObjectWriter *Writer = Ctx->getObjectWriter(); ELFObjectWriter *Writer = Ctx->getObjectWriter();
...@@ -696,7 +696,7 @@ void TargetDataMIPS32::lowerGlobals( ...@@ -696,7 +696,7 @@ void TargetDataMIPS32::lowerGlobals(
} }
} }
void TargetDataMIPS32::lowerConstants() const { void TargetDataMIPS32::lowerConstants() {
if (Ctx->getFlags().getDisableTranslation()) if (Ctx->getFlags().getDisableTranslation())
return; return;
llvm::report_fatal_error("Not yet implemented"); llvm::report_fatal_error("Not yet implemented");
......
...@@ -127,7 +127,7 @@ private: ...@@ -127,7 +127,7 @@ private:
~TargetMIPS32() override {} ~TargetMIPS32() override {}
}; };
class TargetDataMIPS32 : public TargetDataLowering { class TargetDataMIPS32 final : public TargetDataLowering {
TargetDataMIPS32() = delete; TargetDataMIPS32() = delete;
TargetDataMIPS32(const TargetDataMIPS32 &) = delete; TargetDataMIPS32(const TargetDataMIPS32 &) = delete;
TargetDataMIPS32 &operator=(const TargetDataMIPS32 &) = delete; TargetDataMIPS32 &operator=(const TargetDataMIPS32 &) = delete;
...@@ -137,8 +137,8 @@ public: ...@@ -137,8 +137,8 @@ public:
return std::unique_ptr<TargetDataLowering>(new TargetDataMIPS32(Ctx)); return std::unique_ptr<TargetDataLowering>(new TargetDataMIPS32(Ctx));
} }
void lowerGlobals(std::unique_ptr<VariableDeclarationList> Vars) const final; void lowerGlobals(std::unique_ptr<VariableDeclarationList> Vars) override;
void lowerConstants() const final; void lowerConstants() override;
protected: protected:
explicit TargetDataMIPS32(GlobalContext *Ctx); explicit TargetDataMIPS32(GlobalContext *Ctx);
......
...@@ -5017,7 +5017,7 @@ void TargetX8632::emit(const ConstantUndef *) const { ...@@ -5017,7 +5017,7 @@ void TargetX8632::emit(const ConstantUndef *) const {
TargetDataX8632::TargetDataX8632(GlobalContext *Ctx) TargetDataX8632::TargetDataX8632(GlobalContext *Ctx)
: TargetDataLowering(Ctx) {} : TargetDataLowering(Ctx) {}
void TargetDataX8632::lowerGlobal(const VariableDeclaration &Var) const { void TargetDataX8632::lowerGlobal(const VariableDeclaration &Var) {
// If external and not initialized, this must be a cross test. // If external and not initialized, this must be a cross test.
// Don't generate a declaration for such cases. // Don't generate a declaration for such cases.
bool IsExternal = Var.isExternal() || Ctx->getFlags().getDisableInternal(); bool IsExternal = Var.isExternal() || Ctx->getFlags().getDisableInternal();
...@@ -5094,7 +5094,7 @@ void TargetDataX8632::lowerGlobal(const VariableDeclaration &Var) const { ...@@ -5094,7 +5094,7 @@ void TargetDataX8632::lowerGlobal(const VariableDeclaration &Var) const {
} }
void TargetDataX8632::lowerGlobals( void TargetDataX8632::lowerGlobals(
std::unique_ptr<VariableDeclarationList> Vars) const { std::unique_ptr<VariableDeclarationList> Vars) {
switch (Ctx->getFlags().getOutFileType()) { switch (Ctx->getFlags().getOutFileType()) {
case FT_Elf: { case FT_Elf: {
ELFObjectWriter *Writer = Ctx->getObjectWriter(); ELFObjectWriter *Writer = Ctx->getObjectWriter();
...@@ -5170,7 +5170,7 @@ void TargetDataX8632::emitConstantPool(GlobalContext *Ctx) { ...@@ -5170,7 +5170,7 @@ void TargetDataX8632::emitConstantPool(GlobalContext *Ctx) {
} }
} }
void TargetDataX8632::lowerConstants() const { void TargetDataX8632::lowerConstants() {
if (Ctx->getFlags().getDisableTranslation()) if (Ctx->getFlags().getDisableTranslation())
return; return;
// No need to emit constants from the int pool since (for x86) they // No need to emit constants from the int pool since (for x86) they
......
...@@ -577,7 +577,7 @@ private: ...@@ -577,7 +577,7 @@ private:
BoolFolding FoldingInfo; BoolFolding FoldingInfo;
}; };
class TargetDataX8632 : public TargetDataLowering { class TargetDataX8632 final : public TargetDataLowering {
TargetDataX8632() = delete; TargetDataX8632() = delete;
TargetDataX8632(const TargetDataX8632 &) = delete; TargetDataX8632(const TargetDataX8632 &) = delete;
TargetDataX8632 &operator=(const TargetDataX8632 &) = delete; TargetDataX8632 &operator=(const TargetDataX8632 &) = delete;
...@@ -587,14 +587,14 @@ public: ...@@ -587,14 +587,14 @@ public:
return std::unique_ptr<TargetDataLowering>(new TargetDataX8632(Ctx)); return std::unique_ptr<TargetDataLowering>(new TargetDataX8632(Ctx));
} }
void lowerGlobals(std::unique_ptr<VariableDeclarationList> Vars) const final; void lowerGlobals(std::unique_ptr<VariableDeclarationList> Vars) override;
void lowerConstants() const final; void lowerConstants() override;
protected: protected:
explicit TargetDataX8632(GlobalContext *Ctx); explicit TargetDataX8632(GlobalContext *Ctx);
private: private:
void lowerGlobal(const VariableDeclaration &Var) const; void lowerGlobal(const VariableDeclaration &Var);
~TargetDataX8632() override {} ~TargetDataX8632() override {}
template <typename T> static void emitConstantPool(GlobalContext *Ctx); template <typename T> static void emitConstantPool(GlobalContext *Ctx);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment