Skip to content

Commit 609e9ee

Browse files
labathlabath
committed
fix warnings in tests
1 parent 26b46c0 commit 609e9ee

File tree

3 files changed

+144
-144
lines changed

3 files changed

+144
-144
lines changed

‎lldb/unittests/UnwindAssembly/ARM64/TestArm64InstEmulation.cpp

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ TEST_F(TestArm64InstEmulation, TestSimpleDarwinFunction) {
9090

9191
// CFA=sp +0 => fp= <same> lr= <same>
9292
row = unwind_plan.GetRowForFunctionOffset(0);
93-
EXPECT_EQ(0ull, row->GetOffset());
93+
EXPECT_EQ(0, row->GetOffset());
9494
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
9595
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
9696
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -103,7 +103,7 @@ TEST_F(TestArm64InstEmulation, TestSimpleDarwinFunction) {
103103

104104
// CFA=sp+16 => fp=[CFA-16] lr=[CFA-8]
105105
row = unwind_plan.GetRowForFunctionOffset(4);
106-
EXPECT_EQ(4ull, row->GetOffset());
106+
EXPECT_EQ(4, row->GetOffset());
107107
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
108108
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
109109
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
@@ -118,7 +118,7 @@ TEST_F(TestArm64InstEmulation, TestSimpleDarwinFunction) {
118118

119119
// CFA=fp+16 => fp=[CFA-16] lr=[CFA-8]
120120
row = unwind_plan.GetRowForFunctionOffset(8);
121-
EXPECT_EQ(8ull, row->GetOffset());
121+
EXPECT_EQ(8, row->GetOffset());
122122
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_fp_arm64);
123123
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
124124
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
@@ -133,7 +133,7 @@ TEST_F(TestArm64InstEmulation, TestSimpleDarwinFunction) {
133133

134134
// CFA=sp+16 => fp=[CFA-16] lr=[CFA-8]
135135
row = unwind_plan.GetRowForFunctionOffset(16);
136-
EXPECT_EQ(16ull, row->GetOffset());
136+
EXPECT_EQ(16, row->GetOffset());
137137
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
138138
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
139139
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
@@ -148,7 +148,7 @@ TEST_F(TestArm64InstEmulation, TestSimpleDarwinFunction) {
148148

149149
// CFA=sp +0 => fp= <same> lr= <same>
150150
row = unwind_plan.GetRowForFunctionOffset(20);
151-
EXPECT_EQ(20ull, row->GetOffset());
151+
EXPECT_EQ(20, row->GetOffset());
152152
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
153153
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
154154
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -219,14 +219,14 @@ TEST_F(TestArm64InstEmulation, TestMediumDarwinFunction) {
219219

220220
// 0: CFA=sp +0 =>
221221
row = unwind_plan.GetRowForFunctionOffset(0);
222-
EXPECT_EQ(0ull, row->GetOffset());
222+
EXPECT_EQ(0, row->GetOffset());
223223
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
224224
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
225225
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
226226

227227
// 4: CFA=sp+48 => x21=[CFA-40] x22=[CFA-48]
228228
row = unwind_plan.GetRowForFunctionOffset(4);
229-
EXPECT_EQ(4ull, row->GetOffset());
229+
EXPECT_EQ(4, row->GetOffset());
230230
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
231231
EXPECT_EQ(48, row->GetCFAValue().GetOffset());
232232

@@ -240,7 +240,7 @@ TEST_F(TestArm64InstEmulation, TestMediumDarwinFunction) {
240240

241241
// 8: CFA=sp+48 => x19=[CFA-24] x20=[CFA-32] x21=[CFA-40] x22=[CFA-48]
242242
row = unwind_plan.GetRowForFunctionOffset(8);
243-
EXPECT_EQ(8ull, row->GetOffset());
243+
EXPECT_EQ(8, row->GetOffset());
244244
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
245245
EXPECT_EQ(48, row->GetCFAValue().GetOffset());
246246

@@ -255,7 +255,7 @@ TEST_F(TestArm64InstEmulation, TestMediumDarwinFunction) {
255255
// 12: CFA=sp+48 => x19=[CFA-24] x20=[CFA-32] x21=[CFA-40] x22=[CFA-48]
256256
// fp=[CFA-16] lr=[CFA-8]
257257
row = unwind_plan.GetRowForFunctionOffset(12);
258-
EXPECT_EQ(12ull, row->GetOffset());
258+
EXPECT_EQ(12, row->GetOffset());
259259
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
260260
EXPECT_EQ(48, row->GetCFAValue().GetOffset());
261261

@@ -270,23 +270,23 @@ TEST_F(TestArm64InstEmulation, TestMediumDarwinFunction) {
270270
// 16: CFA=fp+16 => x19=[CFA-24] x20=[CFA-32] x21=[CFA-40] x22=[CFA-48]
271271
// fp=[CFA-16] lr=[CFA-8]
272272
row = unwind_plan.GetRowForFunctionOffset(16);
273-
EXPECT_EQ(16ull, row->GetOffset());
273+
EXPECT_EQ(16, row->GetOffset());
274274
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_fp_arm64);
275275
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
276276
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
277277

278278
// 28: CFA=sp+48 => x19=[CFA-24] x20=[CFA-32] x21=[CFA-40] x22=[CFA-48]
279279
// fp=[CFA-16] lr=[CFA-8]
280280
row = unwind_plan.GetRowForFunctionOffset(28);
281-
EXPECT_EQ(28ull, row->GetOffset());
281+
EXPECT_EQ(28, row->GetOffset());
282282
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
283283
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
284284
EXPECT_EQ(48, row->GetCFAValue().GetOffset());
285285

286286
// 32: CFA=sp+48 => x19=[CFA-24] x20=[CFA-32] x21=[CFA-40] x22=[CFA-48] fp=
287287
// <same> lr= <same>
288288
row = unwind_plan.GetRowForFunctionOffset(32);
289-
EXPECT_EQ(32ull, row->GetOffset());
289+
EXPECT_EQ(32, row->GetOffset());
290290

291291
// I'd prefer if these restored registers were cleared entirely instead of set
292292
// to IsSame...
@@ -299,7 +299,7 @@ TEST_F(TestArm64InstEmulation, TestMediumDarwinFunction) {
299299
// 36: CFA=sp+48 => x19= <same> x20= <same> x21=[CFA-40] x22=[CFA-48] fp=
300300
// <same> lr= <same>
301301
row = unwind_plan.GetRowForFunctionOffset(36);
302-
EXPECT_EQ(36ull, row->GetOffset());
302+
EXPECT_EQ(36, row->GetOffset());
303303

304304
EXPECT_TRUE(row->GetRegisterInfo(gpr_x19_arm64, regloc));
305305
EXPECT_TRUE(regloc.IsSame());
@@ -310,7 +310,7 @@ TEST_F(TestArm64InstEmulation, TestMediumDarwinFunction) {
310310
// 40: CFA=sp +0 => x19= <same> x20= <same> x21= <same> x22= <same> fp= <same>
311311
// lr= <same>
312312
row = unwind_plan.GetRowForFunctionOffset(40);
313-
EXPECT_EQ(40ull, row->GetOffset());
313+
EXPECT_EQ(40, row->GetOffset());
314314
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
315315
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
316316
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -373,7 +373,7 @@ TEST_F(TestArm64InstEmulation, TestFramelessThreeEpilogueFunction) {
373373

374374
// 0: CFA=sp +0 =>
375375
row = unwind_plan.GetRowForFunctionOffset(0);
376-
EXPECT_EQ(0ull, row->GetOffset());
376+
EXPECT_EQ(0, row->GetOffset());
377377
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
378378
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
379379
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -503,7 +503,7 @@ TEST_F(TestArm64InstEmulation, TestRegisterSavedTwice) {
503503
sample_range, data, sizeof(data), unwind_plan));
504504

505505
row = unwind_plan.GetRowForFunctionOffset(36);
506-
EXPECT_EQ(28ull, row->GetOffset());
506+
EXPECT_EQ(28, row->GetOffset());
507507
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_fp_arm64);
508508
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
509509
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
@@ -513,7 +513,7 @@ TEST_F(TestArm64InstEmulation, TestRegisterSavedTwice) {
513513
EXPECT_EQ(-32, regloc.GetOffset());
514514

515515
row = unwind_plan.GetRowForFunctionOffset(40);
516-
EXPECT_EQ(28ull, row->GetOffset());
516+
EXPECT_EQ(28, row->GetOffset());
517517
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_fp_arm64);
518518
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
519519
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
@@ -619,7 +619,7 @@ TEST_F(TestArm64InstEmulation, TestRegisterDoubleSpills) {
619619
// d8=[CFA-40] d9=[CFA-48] d10=[CFA-56] d11=[CFA-64] d12=[CFA-72]
620620
// d13=[CFA-80] d14=[CFA-88] d15=[CFA-96]
621621
row = unwind_plan.GetRowForFunctionOffset(28);
622-
EXPECT_EQ(28ull, row->GetOffset());
622+
EXPECT_EQ(28, row->GetOffset());
623623
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_fp_arm64);
624624
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
625625
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
@@ -658,7 +658,7 @@ TEST_F(TestArm64InstEmulation, TestRegisterDoubleSpills) {
658658

659659
// 60: CFA=sp +0 =>
660660
row = unwind_plan.GetRowForFunctionOffset(60);
661-
EXPECT_EQ(60ull, row->GetOffset());
661+
EXPECT_EQ(60, row->GetOffset());
662662
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
663663
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
664664
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -765,30 +765,30 @@ TEST_F(TestArm64InstEmulation, TestCFARegisterTrackedAcrossJumps) {
765765

766766
// Confirm CFA at mid-func epilogue 'ret' is $sp+0
767767
row = unwind_plan.GetRowForFunctionOffset(40);
768-
EXPECT_EQ(40ull, row->GetOffset());
768+
EXPECT_EQ(40, row->GetOffset());
769769
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
770770
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
771771
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
772772

773773
// After the 'ret', confirm we're back to the correct CFA of $fp+16
774774
row = unwind_plan.GetRowForFunctionOffset(44);
775-
EXPECT_EQ(44ull, row->GetOffset());
775+
EXPECT_EQ(44, row->GetOffset());
776776
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_fp_arm64);
777777
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
778778
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
779779

780780
// Confirm that we have no additional UnwindPlan rows before the
781781
// real epilogue -- we still get the Row at offset 44.
782782
row = unwind_plan.GetRowForFunctionOffset(60);
783-
EXPECT_EQ(44ull, row->GetOffset());
783+
EXPECT_EQ(44, row->GetOffset());
784784
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_fp_arm64);
785785
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
786786
EXPECT_EQ(16, row->GetCFAValue().GetOffset());
787787

788788
// And in the epilogue, confirm that we start by switching back to
789789
// defining the CFA in terms of $sp.
790790
row = unwind_plan.GetRowForFunctionOffset(64);
791-
EXPECT_EQ(64ull, row->GetOffset());
791+
EXPECT_EQ(64, row->GetOffset());
792792
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
793793
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
794794
EXPECT_EQ(32, row->GetCFAValue().GetOffset());
@@ -845,14 +845,14 @@ TEST_F(TestArm64InstEmulation, TestCFAResetToSP) {
845845

846846
// Confirm CFA before epilogue instructions is in terms of $fp
847847
row = unwind_plan.GetRowForFunctionOffset(12);
848-
EXPECT_EQ(12ull, row->GetOffset());
848+
EXPECT_EQ(12, row->GetOffset());
849849
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_fp_arm64);
850850
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
851851

852852
// Confirm that after restoring $fp to caller's value, CFA is now in
853853
// terms of $sp
854854
row = unwind_plan.GetRowForFunctionOffset(16);
855-
EXPECT_EQ(16ull, row->GetOffset());
855+
EXPECT_EQ(16, row->GetOffset());
856856
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_sp_arm64);
857857
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
858858
}

‎lldb/unittests/UnwindAssembly/PPC64/TestPPC64InstEmulation.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ TEST_F(TestPPC64InstEmulation, TestSimpleFunction) {
9797

9898
// 0: CFA=sp+0
9999
row = unwind_plan.GetRowForFunctionOffset(0);
100-
EXPECT_EQ(0ull, row->GetOffset());
100+
EXPECT_EQ(0, row->GetOffset());
101101
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
102102
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
103103
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
104104

105105
// 1: CFA=sp+0 => fp=[CFA-8]
106106
row = unwind_plan.GetRowForFunctionOffset(16);
107-
EXPECT_EQ(16ull, row->GetOffset());
107+
EXPECT_EQ(16, row->GetOffset());
108108
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
109109
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
110110
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -115,7 +115,7 @@ TEST_F(TestPPC64InstEmulation, TestSimpleFunction) {
115115

116116
// 2: CFA=sp+0 => fp=[CFA-8] lr=[CFA+16]
117117
row = unwind_plan.GetRowForFunctionOffset(20);
118-
EXPECT_EQ(20ull, row->GetOffset());
118+
EXPECT_EQ(20, row->GetOffset());
119119
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
120120
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
121121
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -126,7 +126,7 @@ TEST_F(TestPPC64InstEmulation, TestSimpleFunction) {
126126

127127
// 3: CFA=sp+112 => fp=[CFA-8] lr=[CFA+16]
128128
row = unwind_plan.GetRowForFunctionOffset(24);
129-
EXPECT_EQ(24ull, row->GetOffset());
129+
EXPECT_EQ(24, row->GetOffset());
130130
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
131131
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
132132
EXPECT_EQ(112, row->GetCFAValue().GetOffset());
@@ -141,7 +141,7 @@ TEST_F(TestPPC64InstEmulation, TestSimpleFunction) {
141141

142142
// 4: CFA=r31+112 => fp=[CFA-8] lr=[CFA+16]
143143
row = unwind_plan.GetRowForFunctionOffset(28);
144-
EXPECT_EQ(28ull, row->GetOffset());
144+
EXPECT_EQ(28, row->GetOffset());
145145
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r31_ppc64le);
146146
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
147147
EXPECT_EQ(112, row->GetCFAValue().GetOffset());
@@ -156,7 +156,7 @@ TEST_F(TestPPC64InstEmulation, TestSimpleFunction) {
156156

157157
// 5: CFA=sp+0 => fp=[CFA-8] lr=[CFA+16]
158158
row = unwind_plan.GetRowForFunctionOffset(40);
159-
EXPECT_EQ(40ull, row->GetOffset());
159+
EXPECT_EQ(40, row->GetOffset());
160160
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
161161
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
162162
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -209,14 +209,14 @@ TEST_F(TestPPC64InstEmulation, TestMediumFunction) {
209209

210210
// 0: CFA=sp+0
211211
row = unwind_plan.GetRowForFunctionOffset(0);
212-
EXPECT_EQ(0ull, row->GetOffset());
212+
EXPECT_EQ(0, row->GetOffset());
213213
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
214214
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
215215
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
216216

217217
// 1: CFA=sp+0 => fp=[CFA-8]
218218
row = unwind_plan.GetRowForFunctionOffset(8);
219-
EXPECT_EQ(8ull, row->GetOffset());
219+
EXPECT_EQ(8, row->GetOffset());
220220
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
221221
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
222222
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -227,7 +227,7 @@ TEST_F(TestPPC64InstEmulation, TestMediumFunction) {
227227

228228
// 2: CFA=sp+0 => fp=[CFA-8] lr=[CFA+16]
229229
row = unwind_plan.GetRowForFunctionOffset(12);
230-
EXPECT_EQ(12ull, row->GetOffset());
230+
EXPECT_EQ(12, row->GetOffset());
231231
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
232232
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
233233
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
@@ -238,20 +238,20 @@ TEST_F(TestPPC64InstEmulation, TestMediumFunction) {
238238

239239
// 3: CFA=r30
240240
row = unwind_plan.GetRowForFunctionOffset(16);
241-
EXPECT_EQ(16ull, row->GetOffset());
241+
EXPECT_EQ(16, row->GetOffset());
242242
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r30_ppc64le);
243243
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
244244
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
245245

246246
row = unwind_plan.GetRowForFunctionOffset(32);
247-
EXPECT_EQ(16ull, row->GetOffset());
247+
EXPECT_EQ(16, row->GetOffset());
248248
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r30_ppc64le);
249249
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
250250
EXPECT_EQ(0, row->GetCFAValue().GetOffset());
251251

252252
// 4: CFA=sp+0
253253
row = unwind_plan.GetRowForFunctionOffset(36);
254-
EXPECT_EQ(36ull, row->GetOffset());
254+
EXPECT_EQ(36, row->GetOffset());
255255
EXPECT_TRUE(row->GetCFAValue().GetRegisterNumber() == gpr_r1_ppc64le);
256256
EXPECT_TRUE(row->GetCFAValue().IsRegisterPlusOffset() == true);
257257
EXPECT_EQ(0, row->GetCFAValue().GetOffset());

0 commit comments

Comments
 (0)