GitLab

Magnus pushed to branch ghc-9.12 at Glasgow Haskell Compiler / GHC

Commits:

89df7715

by Ben Gamari at 2026-05-05T11:49:13+02:00

rts: Eliminate uses of implicit constant arrays

Folding of `const`-sized variable-length arrays to a constant-length
array is a gnu extension which clang complains about.

Closes #26502.

(cherry picked from commit 0c00c9c3b4e9b8515d4839f2c1d7d771781dc6f4)

6062c663

by mangoiv at 2026-05-05T11:49:23+02:00

testsuite: filter stderr for static001 on darwin

This reactivates the test on x86_64 darwin as this should have been done
long ago and ignores warnings emitted by ranlib on newer version of the
darwin toolchain since they are benign. (no symbols for stub libraries)

Fixes #27116

(cherry picked from commit b822c30aa6c0bf008c06c5bd4ee86313c40f652d)

97981d8b

by Cheng Shao at 2026-05-05T11:49:33+02:00

testsuite: fix testdir cleanup logic on Windows

testdir cleanup is unreliable on Windows (#13162) and despite existing
hacks in the driver, new failure mode has occurred. This patch makes
it print the warning and carry on when failed to clean up a testdir,
instead of reporting a spurious framework failure. See added comment
for detailed explanation.

(cherry picked from commit ed2c65707aacdf442edb8098a7e5cea5fee5d2b0)

4 changed files:

rts/Printer.c
rts/posix/OSMem.c
testsuite/driver/testlib.py
testsuite/tests/driver/all.T

Changes:

rts/Printer.c

@@ -1009,8 +1009,8 @@ findPtr(P_ p, int follow)
+ {
    uint32_t g, n;
    bdescr *bd;
 -  const int arr_size = 1024;
 -  StgPtr arr[arr_size];
 +#define ARR_SIZE 1024
 +  StgPtr arr[ARR_SIZE];
    int i = 0;
    searched = 0;
@@ -1020,24 +1020,24 @@ findPtr(P_ p, int follow)
    // just before a block is used.
    for (n = 0; n < getNumCapabilities(); n++) {
        bd = nurseries[i].blocks;
 -      i = findPtrBlocks(p,bd,arr,arr_size,i);
 -      if (i >= arr_size) return;
 +      i = findPtrBlocks(p,bd,arr,ARR_SIZE,i);
 +      if (i >= ARR_SIZE) return;
+   }
  #endif
    for (g = 0; g < RtsFlags.GcFlags.generations; g++) {
        bd = generations[g].blocks;
 -      i = findPtrBlocks(p,bd,arr,arr_size,i);
 +      i = findPtrBlocks(p,bd,arr,ARR_SIZE,i);
        bd = generations[g].large_objects;
 -      i = findPtrBlocks(p,bd,arr,arr_size,i);
 -      if (i >= arr_size) return;
 +      i = findPtrBlocks(p,bd,arr,ARR_SIZE,i);
 +      if (i >= ARR_SIZE) return;
        for (n = 0; n < getNumCapabilities(); n++) {
            i = findPtrBlocks(p, gc_threads[n]->gens[g].part_list,
 -                            arr, arr_size, i);
 +                            arr, ARR_SIZE, i);
            i = findPtrBlocks(p, gc_threads[n]->gens[g].todo_bd,
 -                            arr, arr_size, i);
 +                            arr, ARR_SIZE, i);
+       }
 -      if (i >= arr_size) return;
 +      if (i >= ARR_SIZE) return;
+   }
    if (follow && i == 1) {
        debugBelch("-->\n");

rts/posix/OSMem.c

@@ -585,7 +585,7 @@ void *osReserveHeapMemory(void *startAddressPtr, W_ *len)
+     }
  #endif
 -    const int MAX_ATTEMPTS = 256;
 +#define MAX_ATTEMPTS 256
      void *bad_allocs[MAX_ATTEMPTS];
      size_t bad_alloc_lens[MAX_ATTEMPTS];
      memset(bad_allocs, 0, sizeof(void*) * MAX_ATTEMPTS);

testsuite/driver/testlib.py

@@ -25,7 +25,7 @@ from testglobals import config, ghc_env, default_testopts, brokens, t, \
  from testutil import strip_quotes, lndir, link_or_copy_file, passed, \
                       failBecause, testing_metrics, residency_testing_metrics, \
                       stable_perf_counters, \
 -                     PassFail, badResult, memoize, str_removeprefix
 +                     PassFail, badResult, str_warn, str_removeprefix
  from term_color import Color, colored
  import testutil
  from cpu_features import have_cpu_feature
@@ -2992,6 +2992,12 @@ def normalise_errmsg(s: str) -> str:
      # Old emcc warns when we export HEAP8 but new one requires it (see #26290)
      s = s.replace('warning: invalid item in EXPORTED_RUNTIME_METHODS: HEAP8\nwarning: invalid item in EXPORTED_RUNTIME_METHODS: HEAPU8\nemcc: warning: warnings in JS library compilation [-Wjs-compiler]\n','')
 +    # on newer versions of MacOS X, the shipped ranlib warns about object files with no symbols,
 +    # however, these are completely benign stubs.
 +    # See https://gitlab.haskell.org/ghc/ghc/-/issues/27116
 +    if opsys('darwin'):
 +        s = modify_lines(s, lambda l: re.sub(r'.*ranlib:.*has no symbols', '', l))
++
      return s
  # normalise a .prof file, so that we can reasonably compare it against
@@ -3407,9 +3413,20 @@ if config.msys:
                  exception = e
              retries -= 1
 +        # Don't fail as framework error if cleanup fails here, just
 +        # print the warning and proceed. I've seen new failure mode
 +        # here on Windows Server 2025 and recent msys2 installation:
 +        # fifo.lnk is created as read-only and the on_error trick
 +        # above somehow doesn't work.
 +        #
 +        # For a local testsuite run, it's in %TEMP% that will be
 +        # periodically cleaned up anyway; for CI, there's post-job
 +        # cleanup and runner level cleanup. It's better to report
 +        # actual job pass/failure than to waste CPU cycles to spurious
 +        # Windows misery.
          if retries == 0 and testdir.exists():
 -            raise Exception("Unable to remove folder '%s': %s\nUnable to start current test."
 -                            % (testdir, exception))
 +            print(str_warn("Unable to remove folder '%s': %s\nUnable to start current test."
 +                            % (testdir, exception)))
  else:
      def cleanup() -> None:
          testdir = getTestOpts().testdir_raw

testsuite/tests/driver/all.T

@@ -120,9 +120,7 @@ if config.os == 'darwin':
  else:
    only_darwin = skip
 -test('static001', [extra_files(['Static001.hs']),
 -                   only_darwin,
 -                   when(arch('x86_64'), expect_broken(8127))],
 +test('static001', [extra_files(['Static001.hs']), only_darwin],
       makefile_test, ['static001'])
  test('dynHelloWorld',