This is an archive of the discontinued LLVM Phabricator instance.

Differential D120945

[InstrProf][NFC] Fix warning by removing typecast
ClosedPublic

Authored by ellis on Mar 3 2022, 3:11 PM.

Details

Reviewers
kyulee
zequanwu
vsk
Commits
rG9c35303981ae: [InstrProf][NFC] Fix warning by removing typecast
Summary

This fixes a warning about comparing mismatched types. Since mmap() already returns a void * use that as the pointer type for comparison.

Diff Detail

Event Timeline

ellis created this revision.Mar 3 2022, 3:11 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 3 2022, 3:11 PM
Harbormaster completed remote builds in B152470: Diff 412845.Mar 3 2022, 3:31 PM
ellis published this revision for review.Mar 3 2022, 4:30 PM
ellis edited the summary of this revision. (Show Details)
ellis added reviewers: kyulee, zequanwu, vsk.
Herald added a project: Restricted Project. · View Herald TranscriptMar 3 2022, 4:30 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
kyulee added a comment.Mar 3 2022, 4:32 PM

LGTM

kyulee accepted this revision.Mar 3 2022, 4:33 PM
This revision is now accepted and ready to land.Mar 3 2022, 4:33 PM
zequanwu accepted this revision.Mar 3 2022, 4:47 PM
Closed by commit rG9c35303981ae: [InstrProf][NFC] Fix warning by removing typecast (authored by ellis). · Explain WhyMar 4 2022, 10:48 AM
This revision was automatically updated to reflect the committed changes.
ellis added a commit: rG9c35303981ae: [InstrProf][NFC] Fix warning by removing typecast.

Revision Contents

PathSize
compiler-rt/
lib/
profile/
6 lines

Diff 413071

compiler-rt/lib/profile/InstrProfilingFile.c

Show First 20 Lines • Show All 135 Lines • ▼ Show 20 Linesstatic int mmapForContinuousMode(uint64_t CurrentFileOffset, FILE *File) {
__llvm_profile_get_padding_sizes_for_counters( __llvm_profile_get_padding_sizes_for_counters(
DataSize, CountersSize, NamesSize, &PaddingBytesBeforeCounters, DataSize, CountersSize, NamesSize, &PaddingBytesBeforeCounters,
&PaddingBytesAfterCounters, &PaddingBytesAfterNames); &PaddingBytesAfterCounters, &PaddingBytesAfterNames);
uint64_t PageAlignedCountersLength = CountersSize + PaddingBytesAfterCounters; uint64_t PageAlignedCountersLength = CountersSize + PaddingBytesAfterCounters;
uint64_t FileOffsetToCounters = CurrentFileOffset + uint64_t FileOffsetToCounters = CurrentFileOffset +
sizeof(__llvm_profile_header) + DataSize + sizeof(__llvm_profile_header) + DataSize +
PaddingBytesBeforeCounters; PaddingBytesBeforeCounters;
uint64_t *CounterMmap = (uint64_t *)mmap( void *CounterMmap = mmap((void *)CountersBegin, PageAlignedCountersLength,
(void *)CountersBegin, PageAlignedCountersLength, PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED,
MAP_FIXED | MAP_SHARED, Fileno, FileOffsetToCounters); Fileno, FileOffsetToCounters);
if (CounterMmap != CountersBegin) { if (CounterMmap != CountersBegin) {
PROF_ERR( PROF_ERR(
"Continuous counter sync mode is enabled, but mmap() failed (%s).\n" "Continuous counter sync mode is enabled, but mmap() failed (%s).\n"
" - CountersBegin: %p\n" " - CountersBegin: %p\n"
" - PageAlignedCountersLength: %" PRIu64 "\n" " - PageAlignedCountersLength: %" PRIu64 "\n"
" - Fileno: %d\n" " - Fileno: %d\n"
" - FileOffsetToCounters: %" PRIu64 "\n", " - FileOffsetToCounters: %" PRIu64 "\n",
strerror(errno), CountersBegin, PageAlignedCountersLength, Fileno, strerror(errno), CountersBegin, PageAlignedCountersLength, Fileno,
▲ Show 20 Lines • Show All 1,040 Lines • Show Last 20 Lines