[Git][ghc/ghc][wip/T22010] Fix unique_counter in the rts

[Jaro Reinders (@Noughtmare)]

Jaro Reinders pushed to branch wip/T22010 at Glasgow Haskell Compiler / GHC


Commits:
f0d4031d by Jaro Reinders at 2023-06-15T14:55:39+02:00
Fix unique_counter in the rts

- - - - -


5 changed files:

- compiler/cbits/genSym.c
- rts/Globals.c
- rts/RtsSymbols.c
- rts/include/rts/Globals.h
- rts/js/globals.js


Changes:

=====================================
compiler/cbits/genSym.c
=====================================
@@ -9,8 +9,10 @@
 //
 // The CPP is thus about the RTS version GHC is linked against, and not the
 // version of the GHC being built.
-#if !MIN_VERSION_GLASGOW_HASKELL(9,3,0,0)
+#if !MIN_VERSION_GLASGOW_HASKELL(9,7,0,0)
 HsWord64 ghc_unique_counter = 0;
+#endif
+#if !MIN_VERSION_GLASGOW_HASKELL(9,3,0,0)
 HsInt ghc_unique_inc     = 1;
 #endif
 


=====================================
rts/Globals.c
=====================================
@@ -108,5 +108,5 @@ mkStoreAccessor(LibHSghcGlobalHasPprDebug)
 mkStoreAccessor(LibHSghcGlobalHasNoDebugOutput)
 mkStoreAccessor(LibHSghcGlobalHasNoStateHack)
 
-HsInt ghc_unique_counter = 0;
+HsWord64 ghc_unique_counter = 0;
 HsInt ghc_unique_inc     = 1;


=====================================
rts/RtsSymbols.c
=====================================
@@ -902,7 +902,7 @@ extern char **environ;
       SymI_HasProto(stopHeapProfTimer)                                  \
       SymI_HasProto(requestHeapCensus)                                  \
       SymI_HasProto(atomic_inc)                                         \
-      SymI_HasProto(atomic_inc64)                                         \
+      SymI_HasProto(atomic_inc64)                                       \
       SymI_HasProto(atomic_dec)                                         \
       SymI_HasProto(hs_spt_lookup)                                      \
       SymI_HasProto(hs_spt_insert)                                      \


=====================================
rts/include/rts/Globals.h
=====================================
@@ -32,5 +32,5 @@ mkStoreAccessorPrototype(LibHSghcFastStringTable)
 mkStoreAccessorPrototype(LibHSghcGlobalHasPprDebug)
 mkStoreAccessorPrototype(LibHSghcGlobalHasNoDebugOutput)
 mkStoreAccessorPrototype(LibHSghcGlobalHasNoStateHack)
-extern HsInt ghc_unique_counter;
+extern HsWord64 ghc_unique_counter;
 extern HsInt ghc_unique_inc;


=====================================
rts/js/globals.js
=====================================
@@ -20,5 +20,6 @@ GVAR(h$getOrSetLibHSghcFastStringTable, faststring_table)
 
 var h$ghc_unique_inc       = h$newByteArray(4);
 h$ghc_unique_inc.i3[0]     = 1;
-var h$ghc_unique_counter   = h$newByteArray(4);
+var h$ghc_unique_counter   = h$newByteArray(8);
 h$ghc_unique_counter.i3[0] = 0;
+h$ghc_unique_counter.i3[1] = 0;



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f0d4031d667ad78c7ce79e65091241809bdfa0c9

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/f0d4031d667ad78c7ce79e65091241809bdfa0c9
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230615/bf397b83/attachment-0001.html>