GitLab

Alan Zimmerman pushed to branch wip/az/ghc-cpp at Glasgow Haskell Compiler / GHC

Commits:

9995c2b7

by Serge S. Gulin at 2025-05-04T17:13:36+03:00

Support for ARM64 Windows (LLVM-enabled) (fixes #24603)

1. Add Windows AArch64 cross-compilation support via CI jobs
Introduce new CI configurations for cross-compiling to Windows ARM64 using Debian12Wine, FEX, and MSYS2.
Configure toolchain variables for LLVM MinGW and Wine emulation in CI pipelines.

2. Adjust compiler and RTS for AArch64 Windows compatibility
Reserve register `x18` on Windows and Darwin platforms in AArch64 codegen.
Handle Windows-specific relocations and data sections in AArch64 assembler.
Update PEi386 linker to recognize ARM64 binaries and support exception handling.
Adjust LLVM target definitions and data layouts for new architectures.
Update `ghc-toolchain` and build scripts to handle `TablesNextToCode` on Windows ARM64.

3. Enhance CI scripts and stability
Modify `ci.sh` to handle mingw cross-targets, fixing GHC executable paths and test execution.
Use `diff -w` in tests to ignore whitespace differences, improving cross-platform consistency.

4. Refactor and clean up code
Remove redundant imports in hello.hs test.
Improve error messages and checks for unsupported configurations in the driver.
Add `EXDEV` error code to `errno.js`.
Add async/sync flags to IO logs at `base.js`.
Improve POSIX compatibility for file close at `base.js`: decrease indeterminism for mixed cases of async and sync code.

5. Update dependencies: `Cabal`, `Win32`, `directory`, `process`, `haskeline`, and `unix`.

submodule

Co-authored-by: Cheng Shao <terrorjack@type.dance>
Co-authored-by: Dmitrii Egorov <egorov.d.i@icloud.com>
Co-authored-by: Andrei Borzenkov <root@sandwitch.dev>

50fa8165

by Javran Cheng at 2025-05-05T05:55:39-04:00

Suppress unused do-binding if discarded variable is Any or ZonkAny.

Consider example (#25895):

>  do { forever (return ()); blah }

where `forever :: forall a b. IO a -> IO b`.

Nothing constrains `b`, so it will be instantiates with `Any` or
`ZonkAny`.
But we certainly don't want to complain about a discarded do-binding.

Fixes #25895

e46c6b18

by Rodrigo Mesquita at 2025-05-06T09:01:57-04:00

Refactor mkTopLevImportedEnv out of mkTopLevEnv

This makes the code clearer and allows the top-level import context to
be fetched directly from the HomeModInfo through the API (e.g. useful
for the debugger).

0ce0d263

by Rodrigo Mesquita at 2025-05-06T09:01:57-04:00

Export sizeOccEnv from GHC.Types.Name.Occurrence

Counts the number of OccNames in an OccEnv

165f98d8

by Simon Peyton Jones at 2025-05-06T09:02:39-04:00

Fix a bad untouchability bug im simplifyInfer

This patch addresses #26004.  The root cause was that simplifyInfer
was willing to unify variables "far out".  The fix, in
runTcSWithEvBinds', is to initialise the inert set given-eq level with
the current level. See
    (TGE6) in Note [Tracking Given equalities]
in GHC.Tc.Solver.InertSet

Two loosely related refactors:

* Refactored approximateWCX to return just the free type
  variables of the un-quantified constraints.  That avoids duplication
  of work (these free vars are needed in simplifyInfer) and makes it
  clearer that the constraints themselves are irrelevant.

* A little local refactor of TcSMode, which reduces the number of
  parameters to runTcSWithEvBinds

4bedc089

by Alan Zimmerman at 2025-05-06T18:07:57+01:00

GHC-CPP: first rough proof of concept

Processes

     #define FOO
     #ifdef FOO
     x = 1
     #endif

Into

    [ITcppIgnored [L loc ITcppDefine]
    ,ITcppIgnored [L loc ITcppIfdef]
    ,ITvarid "x"
    ,ITequal
    ,ITinteger (IL {il_text = SourceText "1", il_neg = False, il_value = 1})
    ,ITcppIgnored [L loc ITcppEndif]
    ,ITeof]

In time, ITcppIgnored will be pushed into a comment

58ef415b

by Alan Zimmerman at 2025-05-06T18:07:57+01:00

Tidy up before re-visiting the continuation mechanic

638a6fc3

by Alan Zimmerman at 2025-05-06T18:07:57+01:00

Switch preprocessor to continuation passing style

Proof of concept, needs tidying up

cd688d33
by Alan Zimmerman at 2025-05-06T18:07:57+01:00
```
Small cleanup
```
6a924b61
by Alan Zimmerman at 2025-05-06T18:07:57+01:00
```
Get rid of some cruft
```

0ae29cce

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Starting to integrate.

Need to get the pragma recognised and set

40767a46

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Make cppTokens extend to end of line, and process CPP comments

e5c0365b
by Alan Zimmerman at 2025-05-06T18:07:58+01:00
```
Remove unused ITcppDefined
```

aa1b2743

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Allow spaces between # and keyword for preprocessor directive

4116edcd

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Process CPP continuation lines

They are emited as separate ITcppContinue tokens.
Perhaps the processing should be more like a comment, and keep on
going to the end.
BUT, the last line needs to be slurped as a whole.

1927c7fb

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Accumulate CPP continuations, process when ready

Can be simplified further, we only need one CPP token

163c0f61

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Simplify Lexer interface. Only ITcpp

We transfer directive lines through it, then parse them from scratch
in the preprocessor.

38c83ad6

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Deal with directive on last line, with no trailing \n

37b0f683
by Alan Zimmerman at 2025-05-06T18:07:58+01:00
```
Start parsing and processing the directives
```
da250161
by Alan Zimmerman at 2025-05-06T18:07:58+01:00
```
Prepare for processing include files
```

cae69ced

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Move PpState into PreProcess

And initParserState, initPragState too

d84e8056

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Process nested include files

Also move PpState out of Lexer.x, so it is easy to evolve it in a ghci
session, loading utils/check-cpp/Main.hs

6c92a7f9
by Alan Zimmerman at 2025-05-06T18:07:58+01:00
```
Split into separate files
```

7cd10d14

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Starting on expression parser.

But it hangs. Time for Text.Parsec.Expr

bbd04cae

by Alan Zimmerman at 2025-05-06T18:07:58+01:00

Start integrating the ghc-cpp work

From https://github.com/alanz/ghc-cpp

0eb187a4
by Alan Zimmerman at 2025-05-06T18:07:58+01:00
```
WIP
```
940f5b55
by Alan Zimmerman at 2025-05-06T18:07:58+01:00
```
Fixup after rebase
```
d0a3d584
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
WIP
```
efa9fe0a
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Fixup after rebase, including all tests pass
```
fdb1ea18
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Change pragma usage to GHC_CPP from GhcCPP
```
934145eb
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Some comments
```
540fade6
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Reformat
```
12c8fab6
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Delete unused file
```
27061919
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Rename module Parse to ParsePP
```
caf7e9bf
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Clarify naming in the parser
```

fde7bd48

by Alan Zimmerman at 2025-05-06T18:07:59+01:00

WIP. Switching to alex/happy to be able to work in-tree

Since Parsec is not available

56fa02d5

by Alan Zimmerman at 2025-05-06T18:07:59+01:00

Layering is now correct

- GHC lexer, emits CPP tokens
- accumulated in Preprocessor state
- Lexed by CPP lexer, CPP command extracted, tokens concated with
  spaces (to get rid of token pasting via comments)
- if directive lexed and parsed by CPP lexer/parser, and evaluated

69dac201

by Alan Zimmerman at 2025-05-06T18:07:59+01:00

First example working

Loading Example1.hs into ghci, getting the right results

```
{-# LANGUAGE GHC_CPP #-}
module Example1 where

y = 3

x =
  "hello"
  "bye now"

foo = putStrLn x
```

7a654916

by Alan Zimmerman at 2025-05-06T18:07:59+01:00

Rebase, and all tests pass except whitespace for generated parser

0dcd84c5
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
More plumbing. Ready for testing tomorrow.
```

f358cb54

by Alan Zimmerman at 2025-05-06T18:07:59+01:00

Proress. Renamed module State from Types

And at first blush it seems to handle preprocessor scopes properly.

d0d5c285

by Alan Zimmerman at 2025-05-06T18:07:59+01:00

Insert basic GHC version macros into parser

__GLASGOW_HASKELL__
__GLASGOW_HASKELL_FULL_VERSION__
__GLASGOW_HASKELL_PATCHLEVEL1__
__GLASGOW_HASKELL_PATCHLEVEL2__

b7925c05
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Re-sync check-cpp for easy ghci work
```
9d514f90
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
Get rid of warnings
```

0b5f458f

by Alan Zimmerman at 2025-05-06T18:07:59+01:00

Rework macro processing, in check-cpp

Macros kept at the top level, looked up via name, multiple arity
versions per name can be stored

009563f2

by Alan Zimmerman at 2025-05-06T18:07:59+01:00

WIP. Can crack arguments for #define

Next step it to crack out args in an expansion

143cf978
by Alan Zimmerman at 2025-05-06T18:07:59+01:00
```
WIP on arg parsing.
```
ab01dc26
by Alan Zimmerman at 2025-05-06T18:08:00+01:00
```
Progress. Still screwing up nested parens.
```
23ff567d
by Alan Zimmerman at 2025-05-06T18:08:00+01:00
```
Seems to work, but has redundant code
```
8f91f5c3
by Alan Zimmerman at 2025-05-06T18:08:00+01:00
```
Remove redundant code
```
b2d68f7d
by Alan Zimmerman at 2025-05-06T18:08:00+01:00
```
Reformat
```

b96ece80