Skip to content

Commit

Permalink
Only use PROFINFO_WIDTH if WITH_PROFINFO defined (#10102)
Browse files Browse the repository at this point in the history
PROFINFO_WIDTH should be 0 if WITH_PROFINFO is not defined.
This PR ensures that it's never used in this case.
  • Loading branch information
dra27 committed Jan 1, 2021
1 parent e20a5ed commit aca8472
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Changes
Expand Up @@ -14,6 +14,10 @@ Working version
(Stephen Dolan, review by Leo White, Gabriel Scherer and Jacques-Henri
Jourdan)

- #10102: Ignore PROFINFO_WIDTH if WITH_PROFINFO is not defined (technically
a breaking change if the configuration system was being abused before).
(David Allsopp, review by Xavier Leroy)

### Code generation and optimizations:

- #9876: do not cache the young_limit GC variable in a processor register.
Expand Down
4 changes: 4 additions & 0 deletions runtime/caml/mlvalues.h
Expand Up @@ -149,8 +149,12 @@ bits 63 (64-P) (63-P) 10 9 8 7 0

#define Num_tags (1 << 8)
#ifdef ARCH_SIXTYFOUR
#ifdef WITH_PROFINFO
#define Max_wosize (((intnat)1 << (54-PROFINFO_WIDTH)) - 1)
#else
#define Max_wosize (((intnat)1 << 54) - 1)
#endif
#else
#define Max_wosize ((1 << 22) - 1)
#endif /* ARCH_SIXTYFOUR */

Expand Down

0 comments on commit aca8472

Please sign in to comment.