Skip to content

Commit f9b712a

Browse files
sethbrenithsethbrenith
committed
[MERGE #5807 @janisozaur] Remove superfluous const from return types
Merge pull request #5807 from janisozaur:remove-const cf. https://isocpp.org/blog/2013/06/quick-q-should-i-return-a-const-value-stackoverflow
2 parents a53a73f + d995995 commit f9b712a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+82
-82
lines changed

‎lib/Backend/Func.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ class Func
119119
Js::RegSlot returnValueRegSlot = Js::Constants::NoRegister, const bool isInlinedConstructor = false,
120120
Js::ProfileId callSiteIdInParentFunc = UINT16_MAX, bool isGetterSetter = false);
121121
public:
122-
void * const GetCodeGenAllocators()
122+
void * GetCodeGenAllocators()
123123
{
124124
return this->GetTopFunc()->m_codeGenAllocators;
125125
}
126-
InProcCodeGenAllocators * const GetInProcCodeGenAllocators()
126+
InProcCodeGenAllocators * GetInProcCodeGenAllocators()
127127
{
128128
Assert(!JITManager::GetJITManager()->IsJITServer());
129129
return reinterpret_cast<InProcCodeGenAllocators*>(this->GetTopFunc()->m_codeGenAllocators);
@@ -274,7 +274,7 @@ class Func
274274
return &m_output;
275275
}
276276

277-
const JITTimeFunctionBody * const GetJITFunctionBody() const
277+
const JITTimeFunctionBody * GetJITFunctionBody() const
278278
{
279279
return m_workItem->GetJITFunctionBody();
280280
}

‎lib/Backend/GlobOptBlockData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ExprAttributes
2020
}
2121

2222
private:
23-
static const uint32 BitMask(const uint index)
23+
static uint32 BitMask(const uint index)
2424
{
2525
return 1u << index;
2626
}

‎lib/Backend/Lower.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ class Lowerer
626626
bool GenerateFastArgumentsLdElemI(IR::Instr* ldElem, IR::LabelInstr *labelFallThru);
627627
bool GenerateFastRealStackArgumentsLdLen(IR::Instr *ldLen);
628628
bool GenerateFastArgumentsLdLen(IR::Instr *ldLen, IR::LabelInstr* labelFallThru);
629-
static const uint16 GetFormalParamOffset() { /*formal start after frame pointer, return address, function object, callInfo*/ return 4;};
629+
static uint16 GetFormalParamOffset() { /*formal start after frame pointer, return address, function object, callInfo*/ return 4;};
630630

631631
IR::RegOpnd* GenerateFunctionTypeFromFixedFunctionObject(IR::Instr *callInstr, IR::Opnd* functionObjOpnd);
632632

‎lib/Backend/LowerMDShared.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ void LowererMD::ChangeToIMul(IR::Instr *const instr, bool hasOverflowCheck)
12931293
EmitInt4Instr(instr); // IMUL2
12941294
}
12951295

1296-
const uint16
1296+
uint16
12971297
LowererMD::GetFormalParamOffset()
12981298
{
12991299
//In x86\x64 formal params were offset from EBP by the EBP chain, return address, and the 2 non-user params

‎lib/Backend/LowerMDShared.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class LowererMD
6363
static void ChangeToSub(IR::Instr *const instr, const bool needFlags);
6464
static void ChangeToShift(IR::Instr *const instr, const bool needFlags);
6565
static void ChangeToIMul(IR::Instr *const instr, const bool hasOverflowCheck = false);
66-
static const uint16 GetFormalParamOffset();
66+
static uint16 GetFormalParamOffset();
6767
static const Js::OpCode MDUncondBranchOpcode;
6868
static const Js::OpCode MDMultiBranchOpcode;
6969
static const Js::OpCode MDExtend32Opcode;

‎lib/Backend/amd64/EncoderMD.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ EncoderMD::Init(Encoder *encoder)
103103
///
104104
///----------------------------------------------------------------------------
105105

106-
const BYTE
106+
BYTE
107107
EncoderMD::GetOpcodeByte2(IR::Instr *instr)
108108
{
109109
return OpcodeByte2[instr->m_opcode - (Js::OpCode::MDStart+1)];
@@ -161,13 +161,13 @@ EncoderMD::GetOpbyte(IR::Instr *instr)
161161
///
162162
///----------------------------------------------------------------------------
163163

164-
const BYTE
164+
BYTE
165165
EncoderMD::GetRegEncode(IR::RegOpnd *regOpnd)
166166
{
167167
return this->GetRegEncode(regOpnd->GetReg());
168168
}
169169

170-
const BYTE
170+
BYTE
171171
EncoderMD::GetRegEncode(RegNum reg)
172172
{
173173
AssertMsg(reg != RegNOREG, "should have valid reg in encoder");
@@ -189,7 +189,7 @@ EncoderMD::GetRegEncode(RegNum reg)
189189
///
190190
///----------------------------------------------------------------------------
191191

192-
const uint32
192+
uint32
193193
EncoderMD::GetOpdope(IR::Instr *instr)
194194
{
195195
return Opdope[instr->m_opcode - (Js::OpCode::MDStart+1)];
@@ -203,7 +203,7 @@ EncoderMD::GetOpdope(IR::Instr *instr)
203203
///
204204
///----------------------------------------------------------------------------
205205

206-
const uint32
206+
uint32
207207
EncoderMD::GetLeadIn(IR::Instr * instr)
208208
{
209209
return OpcodeLeadIn[instr->m_opcode - (Js::OpCode::MDStart+1)];

‎lib/Backend/amd64/EncoderMD.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,14 @@ class EncoderMD
202202
void AddLabelReloc(BYTE* relocAddress);
203203

204204
private:
205-
const BYTE GetOpcodeByte2(IR::Instr *instr);
205+
BYTE GetOpcodeByte2(IR::Instr *instr);
206206
static Forms GetInstrForm(IR::Instr *instr);
207207
const BYTE * GetFormTemplate(IR::Instr *instr);
208208
const BYTE * GetOpbyte(IR::Instr *instr);
209-
const BYTE GetRegEncode(IR::RegOpnd *regOpnd);
210-
const BYTE GetRegEncode(RegNum reg);
211-
static const uint32 GetOpdope(IR::Instr *instr);
212-
const uint32 GetLeadIn(IR::Instr * instr);
209+
BYTE GetRegEncode(IR::RegOpnd *regOpnd);
210+
BYTE GetRegEncode(RegNum reg);
211+
static uint32 GetOpdope(IR::Instr *instr);
212+
uint32 GetLeadIn(IR::Instr * instr);
213213
BYTE EmitModRM(IR::Instr * instr, IR::Opnd *opnd, BYTE reg1);
214214
void EmitConst(size_t val, int size, bool allowImm64 = false);
215215
BYTE EmitImmed(IR::Opnd * opnd, int opSize, int sbit, bool allowImm64 = false);

‎lib/Backend/arm/EncoderMD.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ EncoderMD::Init(Encoder *encoder)
3434
///
3535
///----------------------------------------------------------------------------
3636

37-
const BYTE
37+
BYTE
3838
EncoderMD::GetRegEncode(IR::RegOpnd *regOpnd)
3939
{
4040
return GetRegEncode(regOpnd->GetReg());
4141
}
4242

43-
const BYTE
43+
BYTE
4444
EncoderMD::GetRegEncode(RegNum reg)
4545
{
4646
return RegEncode[reg];
4747
}
4848

49-
const BYTE
49+
BYTE
5050
EncoderMD::GetFloatRegEncode(IR::RegOpnd *regOpnd)
5151
{
5252
//Each double register holds two single precision registers.

‎lib/Backend/arm/EncoderMD.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ class EncoderMD
5858
void ApplyRelocs(uint32 codeBufferAddress, size_t codeSize, uint* bufferCRC, BOOL isBrShorteningSucceeded, bool isFinalBufferValidation = false);
5959
static bool TryConstFold(IR::Instr *instr, IR::RegOpnd *regOpnd);
6060
static bool TryFold(IR::Instr *instr, IR::RegOpnd *regOpnd);
61-
const BYTE GetRegEncode(IR::RegOpnd *regOpnd);
62-
const BYTE GetFloatRegEncode(IR::RegOpnd *regOpnd);
63-
static const BYTE GetRegEncode(RegNum reg);
61+
BYTE GetRegEncode(IR::RegOpnd *regOpnd);
62+
BYTE GetFloatRegEncode(IR::RegOpnd *regOpnd);
63+
static BYTE GetRegEncode(RegNum reg);
6464
static uint32 GetOpdope(IR::Instr *instr);
6565
static uint32 GetOpdope(Js::OpCode op);
6666

‎lib/Backend/arm64/EncoderMD.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ EncoderMD::Init(Encoder *encoder)
4444
///
4545
///----------------------------------------------------------------------------
4646

47-
const BYTE
47+
BYTE
4848
EncoderMD::GetRegEncode(IR::RegOpnd *regOpnd)
4949
{
5050
return GetRegEncode(regOpnd->GetReg());
5151
}
5252

53-
const BYTE
53+
BYTE
5454
EncoderMD::GetRegEncode(RegNum reg)
5555
{
5656
return RegEncode[reg];
5757
}
5858

59-
const BYTE
59+
BYTE
6060
EncoderMD::GetFloatRegEncode(IR::RegOpnd *regOpnd)
6161
{
6262
BYTE regEncode = GetRegEncode(regOpnd->GetReg());

0 commit comments

Comments
 (0)