Skip to content

Commit 744e823

Browse files
josesimoesjosesimoes
authored
Fix inits of local declarations (#2884)
***NO_CI***
1 parent 17c0d59 commit 744e823

22 files changed

+150
-146
lines changed

‎src/CLR/CorLib/corlib_native_System_Reflection_ConstructorInfo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ HRESULT Library_corlib_native_System_Reflection_ConstructorInfo::Invoke___OBJECT
2222
NANOCLR_HEADER();
2323

2424
CLR_RT_HeapBlock *thisRef = stack.ThisRef().Dereference();
25-
CLR_RT_MethodDef_Instance md;
25+
CLR_RT_MethodDef_Instance md{};
2626
CLR_RT_HeapBlock_Array *pArray = stack.Arg1().DereferenceArray();
2727
CLR_RT_HeapBlock *args = NULL;
2828
int numArgs = 0;

‎src/CLR/CorLib/corlib_native_System_Reflection_FieldInfo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ HRESULT Library_corlib_native_System_Reflection_FieldInfo::SetValue___VOID__OBJE
1212

1313
CLR_RT_FieldDef_Instance instFD;
1414
CLR_RT_TypeDef_Instance instTD;
15-
CLR_RT_TypeDescriptor instTDescObj;
16-
CLR_RT_TypeDef_Instance instTDField;
15+
CLR_RT_TypeDescriptor instTDescObj{};
16+
CLR_RT_TypeDef_Instance instTDField{};
1717
const CLR_RECORD_FIELDDEF *fd;
1818
CLR_RT_HeapBlock *obj;
1919
bool fValueType;

‎src/CLR/CorLib/corlib_native_System_Reflection_MethodBase.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ HRESULT Library_corlib_native_System_Reflection_MethodBase::get_DeclaringType___
2626
NANOCLR_HEADER();
2727

2828
CLR_RT_MethodDef_Instance md;
29-
CLR_RT_TypeDef_Instance cls;
29+
CLR_RT_TypeDef_Instance cls{};
3030
CLR_RT_HeapBlock *hbMeth = stack.Arg0().Dereference();
3131

3232
NANOCLR_CHECK_HRESULT(GetMethodDescriptor(stack, *hbMeth, md));
@@ -194,9 +194,9 @@ HRESULT Library_corlib_native_System_Reflection_MethodBase::GetParametersNative_
194194
{
195195
NANOCLR_HEADER();
196196

197-
CLR_RT_MethodDef_Instance inst;
198-
CLR_RT_MethodDef_Index idx;
199-
CLR_RT_SignatureParser sigParser;
197+
CLR_RT_MethodDef_Instance inst{};
198+
CLR_RT_MethodDef_Index idx{};
199+
CLR_RT_SignatureParser sigParser{};
200200
CLR_RT_TypeDef_Index paramInfoTypeDef;
201201
CLR_RT_SignatureParser::Element paramElement;
202202
CLR_RT_HeapBlock *hbObj;

‎src/CLR/CorLib/corlib_native_System_Reflection_RuntimeFieldInfo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ HRESULT Library_corlib_native_System_Reflection_RuntimeFieldInfo::get_DeclaringT
2727
NANOCLR_HEADER();
2828

2929
CLR_RT_FieldDef_Instance fd;
30-
CLR_RT_TypeDef_Instance cls;
30+
CLR_RT_TypeDef_Instance cls{};
3131
CLR_RT_HeapBlock *hbField = stack.Arg0().Dereference();
3232

3333
if (GetFieldDescriptor(stack, *hbField, fd) == false)

‎src/CLR/CorLib/corlib_native_System_Reflection_RuntimeMethodInfo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ HRESULT Library_corlib_native_System_Reflection_RuntimeMethodInfo::get_ReturnTyp
1111
NANOCLR_HEADER();
1212

1313
CLR_RT_MethodDef_Instance md;
14-
CLR_RT_SignatureParser parser;
15-
CLR_RT_TypeDescriptor desc;
14+
CLR_RT_SignatureParser parser{};
15+
CLR_RT_TypeDescriptor desc{};
1616
CLR_RT_HeapBlock *hbMeth = stack.Arg0().Dereference();
1717

1818
NANOCLR_CHECK_HRESULT(Library_corlib_native_System_Reflection_MethodBase::GetMethodDescriptor(stack, *hbMeth, md));

‎src/CLR/CorLib/corlib_native_System_RuntimeType.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ HRESULT Library_corlib_native_System_RuntimeType::get_Assembly___SystemReflectio
1616
NANOCLR_CHECK_HRESULT(GetTypeDescriptor(*hbType, td, NULL));
1717

1818
{
19-
CLR_RT_Assembly_Index idx;
19+
CLR_RT_Assembly_Index idx{};
2020
idx.Set(td.Assembly());
2121
CLR_RT_HeapBlock &top = stack.PushValue();
2222
CLR_RT_HeapBlock *hbObj;
@@ -127,7 +127,7 @@ HRESULT Library_corlib_native_System_RuntimeType::GetInterfaces___SZARRAY_System
127127
do
128128
{
129129
// Scan the list of interfaces.
130-
CLR_RT_SignatureParser parser;
130+
CLR_RT_SignatureParser parser{};
131131
parser.Initialize_Interfaces(td.m_assm, td.m_target);
132132
CLR_RT_SignatureParser::Element res;
133133

@@ -239,7 +239,7 @@ HRESULT Library_corlib_native_System_RuntimeType::GetName(CLR_RT_HeapBlock &arg,
239239

240240
CLR_RT_TypeDef_Instance td;
241241
CLR_UINT32 levels;
242-
char rgBuffer[256];
242+
char rgBuffer[256]{};
243243
char *szBuffer;
244244
size_t iBuffer;
245245

@@ -378,12 +378,12 @@ HRESULT Library_corlib_native_System_RuntimeType::GetCustomAttributes(
378378

379379
// get the type for the class object
380380
// the assembly has to be the instance type
381-
CLR_RT_MethodDef_Index md;
381+
CLR_RT_MethodDef_Index md{};
382382
md.Set(instanceTypeDef.m_assm->m_idx, parser.m_mdIdx.Method());
383-
CLR_RT_MethodDef_Instance mdInst;
383+
CLR_RT_MethodDef_Instance mdInst{};
384384
mdInst.InitializeFromIndex(md);
385385

386-
CLR_RT_TypeDef_Instance cls;
386+
CLR_RT_TypeDef_Instance cls{};
387387
if (cls.InitializeFromMethod(mdInst) == false)
388388
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
389389

‎src/CLR/CorLib/corlib_native_System_String.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ HRESULT Library_corlib_native_System_String::ConvertToCharArray(
12051205
NATIVE_PROFILE_CLR_CORE();
12061206
NANOCLR_HEADER();
12071207

1208-
CLR_RT_UnicodeHelper uh;
1208+
CLR_RT_UnicodeHelper uh{};
12091209
int totLength;
12101210

12111211
FAULT_ON_NULL(szText);

‎src/CLR/CorLib/corlib_native_System_Type.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ HRESULT Library_corlib_native_System_Type::GetMethods(
529529
NATIVE_PROFILE_CLR_CORE();
530530
NANOCLR_HEADER();
531531

532-
CLR_RT_MethodDef_Instance inst;
532+
CLR_RT_MethodDef_Instance inst{};
533533
inst.Clear();
534534
CLR_RT_TypeDef_Instance td;
535535
CLR_RT_TypeDef_Instance tdArg;
@@ -637,9 +637,9 @@ HRESULT Library_corlib_native_System_Type::GetMethods(
637637

638638
if (pParams)
639639
{
640-
CLR_RT_SignatureParser parserLeft;
640+
CLR_RT_SignatureParser parserLeft{};
641641
parserLeft.Initialize_MethodSignature(assm, md);
642-
CLR_RT_SignatureParser parserRight;
642+
CLR_RT_SignatureParser parserRight{};
643643
parserRight.Initialize_Objects(pParams, iParams, true);
644644
CLR_RT_SignatureParser::Element res;
645645

@@ -654,9 +654,9 @@ HRESULT Library_corlib_native_System_Type::GetMethods(
654654
}
655655
}
656656

657-
CLR_RT_MethodDef_Index idx;
657+
CLR_RT_MethodDef_Index idx{};
658658
idx.Set(td.Assembly(), i + tdR->methods_First);
659-
CLR_RT_MethodDef_Instance inst2;
659+
CLR_RT_MethodDef_Instance inst2{};
660660
inst2.InitializeFromIndex(idx);
661661

662662
if (fAllMatches)
@@ -683,9 +683,9 @@ HRESULT Library_corlib_native_System_Type::GetMethods(
683683

684684
if (NANOCLR_INDEX_IS_VALID(inst))
685685
{
686-
CLR_RT_SignatureParser parserLeft;
686+
CLR_RT_SignatureParser parserLeft{};
687687
parserLeft.Initialize_MethodSignature(inst.m_assm, inst.m_target);
688-
CLR_RT_SignatureParser parserRight;
688+
CLR_RT_SignatureParser parserRight{};
689689
parserRight.Initialize_MethodSignature(inst2.m_assm, inst2.m_target);
690690

691691
CLR_RT_SignatureParser::Element resLeft;

‎src/CLR/Core/CLR_RT_HeapBlock.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ HRESULT CLR_RT_HeapBlock::SetReflection(const CLR_RT_MethodDef_Index &md)
278278
NATIVE_PROFILE_CLR_CORE();
279279
NANOCLR_HEADER();
280280

281-
CLR_RT_MethodDef_Instance inst;
281+
CLR_RT_MethodDef_Instance inst{};
282282

283283
if (inst.InitializeFromIndex(md) == false)
284284
{
@@ -299,7 +299,7 @@ HRESULT CLR_RT_HeapBlock::SetObjectCls(const CLR_RT_TypeDef_Index &cls)
299299
NATIVE_PROFILE_CLR_CORE();
300300
NANOCLR_HEADER();
301301

302-
CLR_RT_TypeDef_Instance inst;
302+
CLR_RT_TypeDef_Instance inst{};
303303

304304
if (inst.InitializeFromIndex(cls) == false)
305305
{
@@ -455,7 +455,7 @@ HRESULT CLR_RT_HeapBlock::LoadFromReference(CLR_RT_HeapBlock &ref)
455455

456456
if (objT && objT->IsBoxed())
457457
{
458-
CLR_RT_TypeDef_Instance inst;
458+
CLR_RT_TypeDef_Instance inst{};
459459
if (objT->DataType() != DATATYPE_VALUETYPE)
460460
{
461461
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
@@ -978,7 +978,7 @@ CLR_RT_HeapBlock *CLR_RT_HeapBlock::FixBoxingReference()
978978

979979
if (src->DataType() == DATATYPE_VALUETYPE && src->IsBoxed())
980980
{
981-
CLR_RT_TypeDef_Instance inst;
981+
CLR_RT_TypeDef_Instance inst{};
982982

983983
if (!inst.InitializeFromIndex(src->ObjectCls()))
984984
return NULL;
@@ -1128,7 +1128,7 @@ CLR_UINT32 CLR_RT_HeapBlock::GetHashCode(CLR_RT_HeapBlock *ptr, bool fRecurse, C
11281128
case DATATYPE_CLASS:
11291129
case DATATYPE_VALUETYPE:
11301130
{
1131-
CLR_RT_TypeDef_Instance cls;
1131+
CLR_RT_TypeDef_Instance cls{};
11321132
cls.InitializeFromIndex(ptr->ObjectCls());
11331133

11341134
// check if this is any of the following types
@@ -1356,7 +1356,7 @@ bool CLR_RT_HeapBlock::ObjectsEqual(
13561356

13571357
if (rightObj->DataType() == DATATYPE_VALUETYPE)
13581358
{
1359-
CLR_RT_TypeDef_Instance inst;
1359+
CLR_RT_TypeDef_Instance inst{};
13601360
CLR_RT_HeapBlock *obj = NULL;
13611361

13621362
if (!inst.InitializeFromIndex(rightObj->ObjectCls()))
@@ -1425,7 +1425,7 @@ static const CLR_RT_HeapBlock *FixReflectionForType(const CLR_RT_HeapBlock &src,
14251425

14261426
if (rd.m_kind == REFLECTION_TYPE)
14271427
{
1428-
CLR_RT_TypeDef_Instance inst;
1428+
CLR_RT_TypeDef_Instance inst{};
14291429
CLR_UINT32 levels;
14301430

14311431
if (inst.InitializeFromReflection(rd, &levels) && levels == 0)

‎src/CLR/Core/CLR_RT_HeapBlock_Array.cpp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ HRESULT CLR_RT_HeapBlock_Array::CreateInstance(
1717

1818
CLR_RT_HeapBlock_Array *pArray;
1919
CLR_RT_TypeDef_Index cls;
20-
CLR_RT_TypeDef_Instance inst;
20+
CLR_RT_TypeDef_Instance inst{};
2121

2222
reference.SetObjectReference(NULL);
2323

@@ -92,12 +92,10 @@ HRESULT CLR_RT_HeapBlock_Array::CreateInstance(
9292
NANOCLR_HEADER();
9393

9494
CLR_RT_HeapBlock ref;
95-
CLR_RT_TypeDef_Instance cls;
96-
CLR_RT_TypeSpec_Instance def;
95+
CLR_RT_TypeDef_Instance cls{};
96+
CLR_RT_TypeSpec_Instance def{};
9797

9898
memset(&ref, 0, sizeof(struct CLR_RT_HeapBlock));
99-
memset(&cls, 0, sizeof(CLR_RT_TypeDef_Instance));
100-
memset(&def, 0, sizeof(CLR_RT_TypeSpec_Instance));
10199

102100
if (cls.ResolveToken(tk, assm))
103101
{
@@ -382,15 +380,13 @@ HRESULT CLR_RT_HeapBlock_Array::Copy(
382380
}
383381
else
384382
{
385-
CLR_RT_TypeDescriptor descSrc;
386-
CLR_RT_TypeDescriptor descDst;
383+
CLR_RT_TypeDescriptor descSrc{};
384+
CLR_RT_TypeDescriptor descDst{};
387385
CLR_RT_HeapBlock ref;
388386
CLR_RT_HeapBlock elem;
389387

390388
memset(&ref, 0, sizeof(struct CLR_RT_HeapBlock));
391389
memset(&elem, 0, sizeof(struct CLR_RT_HeapBlock));
392-
memset(&descSrc, 0, sizeof(CLR_RT_TypeDescriptor));
393-
memset(&descDst, 0, sizeof(CLR_RT_TypeDescriptor));
394390

395391
elem.SetObjectReference(NULL);
396392
CLR_RT_ProtectFromGC gc(elem);

0 commit comments

Comments
 (0)