[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: Mark T21336a fragile

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
5d1a1881 by Bryan Richter at 2022-12-12T16:22:36-05:00
Mark T21336a fragile

- - - - -
c30accc2 by Matthew Pickering at 2022-12-12T16:23:11-05:00
Add test for #21476

This issues seems to have been fixed since the ticket was made, so let's
add a test and move on.

Fixes #21476

- - - - -
44c55d64 by Sylvain Henry at 2022-12-13T04:27:51-05:00
JS: fix object file name comparison (#22578)

- - - - -
c974b14a by Bryan Richter at 2022-12-13T04:27:52-05:00
configure: Bump min bootstrap GHC version to 9.2

- - - - -


5 changed files:

- compiler/GHC/Driver/Pipeline/Execute.hs
- configure.ac
- libraries/base/tests/IO/T21336/all.T
- + testsuite/tests/simplCore/should_compile/T21476.hs
- testsuite/tests/simplCore/should_compile/all.T


Changes:

=====================================
compiler/GHC/Driver/Pipeline/Execute.hs
=====================================
@@ -388,7 +388,14 @@ runJsPhase pipe_env hsc_env input_fn = do
   -- ensure the timestamp is refreshed, see Note [JS Backend .o file procedure]. If
   -- they are not the same then we embed the .js file into a .o file with the
   -- addition of a header
-  if (input_fn /= output_fn)
+  --
+  -- We need to canonicalize the paths, otherwise the comparison can return
+  -- wrong results (e.g. with Cabal using paths containing "build/./Foo/..."
+  -- that are compared to "build/Foo/...").
+  --
+  cin  <- canonicalizePath input_fn
+  cout <- canonicalizePath output_fn
+  if (not (equalFilePath cin cout))
     then embedJsFile logger dflags tmpfs unit_env input_fn output_fn
     else touchObjectFile logger dflags output_fn
 


=====================================
configure.ac
=====================================
@@ -224,7 +224,7 @@ if test "$WithGhc" = ""
 then
     AC_MSG_ERROR([GHC is required.])
 fi
-MinBootGhcVersion="9.0"
+MinBootGhcVersion="9.2"
 FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[$MinBootGhcVersion],
     [AC_MSG_ERROR([GHC version $MinBootGhcVersion or later is required to compile GHC.])])
 


=====================================
libraries/base/tests/IO/T21336/all.T
=====================================
@@ -1,6 +1,9 @@
 # N.B. /dev/full exists on Darwin but cannot be opened, failing with -EPERM
 test('T21336a',
-     [unless(opsys('linux') or opsys('freebsd'), skip), js_broken(22261)],
+     [ unless(opsys('linux') or opsys('freebsd'), skip)
+     , js_broken(22261)
+     , fragile(22022)
+     ],
      compile_and_run, [''])
 test('T21336b',
      [unless(opsys('linux') or opsys('freebsd'), skip), js_broken(22352)],


=====================================
testsuite/tests/simplCore/should_compile/T21476.hs
=====================================
@@ -0,0 +1,4 @@
+{-# LANGUAGE MagicHash #-}
+module T21476 where
+import GHC.Exts
+f = keepAlive#


=====================================
testsuite/tests/simplCore/should_compile/all.T
=====================================
@@ -456,3 +456,4 @@ test('T22317', [grep_errmsg(r'ANSWER = YES') ], compile, ['-O -dinline-check m -
 
 test('T22494', [grep_errmsg(r'case') ], compile, ['-O -ddump-simpl -dsuppress-uniques'])
 test('T22491', normal, compile, ['-O2'])
+test('T21476', normal, compile, [''])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/26edef7bde915be5481b1b42a1cbd1414538e57c...c974b14a92de0982a51c984433663e194fbfdc53

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/26edef7bde915be5481b1b42a1cbd1414538e57c...c974b14a92de0982a51c984433663e194fbfdc53
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/20221213/1e393fff/attachment-0001.html>