Skip to content

Fixing developer build on clang >=15 #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 9, 2023
Merged

Fixing developer build on clang >=15 #164

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bae148
Wrapping preservedInPlaceCount in STATISTIC macros to suppress datafl…
Feb 21, 2023
219b831
Suppressing unused variable warning for static that we only look at f…
Feb 21, 2023
4f5f119
Declaring variable as static volatile to ensure clean communication w…
rptb1 Mar 8, 2023
9d120e4
Explaining the purpose of the calls variable in response to <https://…
rptb1 Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/amcss.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static void report(void)

static mps_addr_t make(size_t rootsCount)
{
static unsigned long calls = 0;
static volatile unsigned long calls = 0; /* for use from debugger */
size_t length = rnd() % (scale * avLEN);
size_t size = (length+2) * sizeof(mps_word_t);
mps_addr_t p;
Expand Down
4 changes: 2 additions & 2 deletions code/poolawl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ static void awlSegReclaim(Seg seg, Trace trace)
Bool hasBuffer = SegBuffer(&buffer, seg);
Format format = pool->format;
Count reclaimedGrains = (Count)0;
Count preservedInPlaceCount = (Count)0;
STATISTIC_DECL(Count preservedInPlaceCount = (Count)0)
Size preservedInPlaceSize = (Size)0;
Index i;

Expand Down Expand Up @@ -1089,7 +1089,7 @@ static void awlSegReclaim(Seg seg, Trace trace)
AVER(BTGet(awlseg->scanned, i));
BTSetRange(awlseg->mark, i, j);
BTSetRange(awlseg->scanned, i, j);
++preservedInPlaceCount;
STATISTIC(++preservedInPlaceCount);
preservedInPlaceSize += AddrOffset(p, q);
} else {
BTResRange(awlseg->mark, i, j);
Expand Down
4 changes: 2 additions & 2 deletions code/poollo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static void loSegReclaim(Seg seg, Trace trace)
Bool hasBuffer = SegBuffer(&buffer, seg);
Count reclaimedGrains = (Count)0;
Format format = NULL; /* supress "may be used uninitialized" warning */
Count preservedInPlaceCount = (Count)0;
STATISTIC_DECL(Count preservedInPlaceCount = (Count)0)
Size preservedInPlaceSize = (Size)0;
Bool b;

Expand Down Expand Up @@ -355,7 +355,7 @@ static void loSegReclaim(Seg seg, Trace trace)
q = (*format->skip)(AddrAdd(p, format->headerSize));
q = AddrSub(q, format->headerSize);
if(BTGet(loseg->mark, i)) {
++preservedInPlaceCount;
STATISTIC(++preservedInPlaceCount);
preservedInPlaceSize += AddrOffset(p, q);
} else {
Index j = PoolIndexOfAddr(base, pool, q);
Expand Down