@@ -941,12 +941,11 @@ TEST_P(MaybeSparseInstrProfTest, annotate_vp_data) {
941
941
Instruction *Inst2 = Builder.CreateCondBr (Builder.getTrue (), TBB, FBB);
942
942
annotateValueSite (*M, *Inst, R.get (), IPVK_IndirectCallTarget, 0 );
943
943
944
- InstrProfValueData ValueData[5 ];
945
944
uint32_t N;
946
945
uint64_t T;
947
- bool Res = getValueProfDataFromInst (*Inst, IPVK_IndirectCallTarget, 5 ,
948
- ValueData , N, T);
949
- ASSERT_TRUE (Res );
946
+ auto ValueData =
947
+ getValueProfDataFromInst (*Inst, IPVK_IndirectCallTarget, 5 , N, T);
948
+ ASSERT_NE (ValueData, nullptr );
950
949
ASSERT_EQ (3U , N);
951
950
ASSERT_EQ (21U , T);
952
951
// The result should be sorted already:
@@ -956,23 +955,21 @@ TEST_P(MaybeSparseInstrProfTest, annotate_vp_data) {
956
955
ASSERT_EQ (5U , ValueData[1 ].Count );
957
956
ASSERT_EQ (4000U , ValueData[2 ].Value );
958
957
ASSERT_EQ (4U , ValueData[2 ].Count );
959
- Res = getValueProfDataFromInst (*Inst, IPVK_IndirectCallTarget, 1 , ValueData,
960
- N, T);
961
- ASSERT_TRUE (Res);
958
+ ValueData = getValueProfDataFromInst (*Inst, IPVK_IndirectCallTarget, 1 , N, T);
959
+ ASSERT_NE (ValueData, nullptr );
962
960
ASSERT_EQ (1U , N);
963
961
ASSERT_EQ (21U , T);
964
962
965
- Res = getValueProfDataFromInst (*Inst2, IPVK_IndirectCallTarget, 5 , ValueData,
966
- N, T);
967
- ASSERT_FALSE (Res );
963
+ ValueData =
964
+ getValueProfDataFromInst (*Inst2, IPVK_IndirectCallTarget, 5 , N, T);
965
+ ASSERT_EQ (ValueData, nullptr );
968
966
969
967
// Remove the MD_prof metadata
970
968
Inst->setMetadata (LLVMContext::MD_prof, 0 );
971
969
// Annotate 5 records this time.
972
970
annotateValueSite (*M, *Inst, R.get (), IPVK_IndirectCallTarget, 0 , 5 );
973
- Res = getValueProfDataFromInst (*Inst, IPVK_IndirectCallTarget, 5 ,
974
- ValueData, N, T);
975
- ASSERT_TRUE (Res);
971
+ ValueData = getValueProfDataFromInst (*Inst, IPVK_IndirectCallTarget, 5 , N, T);
972
+ ASSERT_NE (ValueData, nullptr );
976
973
ASSERT_EQ (5U , N);
977
974
ASSERT_EQ (21U , T);
978
975
ASSERT_EQ (6000U , ValueData[0 ].Value );
@@ -993,9 +990,8 @@ TEST_P(MaybeSparseInstrProfTest, annotate_vp_data) {
993
990
{5000 , 2 }, {6000 , 1 }};
994
991
annotateValueSite (*M, *Inst, ArrayRef (VD0Sorted).slice (2 ), 10 ,
995
992
IPVK_IndirectCallTarget, 5 );
996
- Res = getValueProfDataFromInst (*Inst, IPVK_IndirectCallTarget, 5 ,
997
- ValueData, N, T);
998
- ASSERT_TRUE (Res);
993
+ ValueData = getValueProfDataFromInst (*Inst, IPVK_IndirectCallTarget, 5 , N, T);
994
+ ASSERT_NE (ValueData, nullptr );
999
995
ASSERT_EQ (4U , N);
1000
996
ASSERT_EQ (10U , T);
1001
997
ASSERT_EQ (3000U , ValueData[0 ].Value );
0 commit comments