GitLab

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

Commits:

35826d8b

by Matthew Pickering at 2025-06-08T22:00:41+01:00

Hadrian: Add option to generate .hie files for stage1 libraries

The +hie_files flavour transformer can be enabled to produce hie files
for stage1 libraries. The hie files are produced in the
"extra-compilation-artifacts" folder and copied into the resulting
bindist.

At the moment the hie files are not produced for the release flavour,
they add about 170M to the final bindist.

Towards #16901

e2467dbd
by Ryan Hendrickson at 2025-06-09T13:07:05-04:00
```
Fix various failures to -fprint-unicode-syntax
```
1d99d3e4
by maralorn at 2025-06-12T03:47:39-04:00
```
Add necessary flag for js linking
```

974d5734

by maralorn at 2025-06-12T03:47:39-04:00

Don’t use additional linker flags to detect presence of -fno-pie in configure.ac

This mirrors the behavior of ghc-toolchain

1e9eb118

by Andrew Lelechenko at 2025-06-12T03:48:21-04:00

Add HasCallStack to Control.Monad.Fail.fail

CLC proposal https://github.com/haskell/core-libraries-committee/issues/327

2% compile-time allocations increase in T3064, likely because `fail`
is now marginally more expensive to compile.

Metric Increase:
    T3064

6d12060f

by meooow25 at 2025-06-12T14:26:07-04:00

Bump containers submodule to 0.8

Also

* Disable -Wunused-imports for containers
* Allow containers-0.8 for in-tree packages
* Bump some submodules so that they allow containers-0.8. These are not
  at any particular versions.
* Remove unused deps containers and split from ucd2haskell
* Fix tests affected by the new containers and hpc-bin

537bd233

by Peng Fan at 2025-06-12T14:27:02-04:00

NCG/LA64: Optimize code generation and reduce build-directory size.

1. makeFarBranches: Prioritize fewer instruction sequences.
2. Prefer instructions with immediate numbers to reduce register moves,
  e.g. andi,ori,xori,addi.
3. Ppr: Remove unnecessary judgments.
4. genJump: Avoid "ld+jr" as much as possible.
5. BCOND and BCOND1: Implement conditional jumps with two jump ranges,
  with limited choice of the shortest.
6. Implement FSQRT, CLT, CTZ.
7. Remove unnecessary code.

19f20861

by Simon Peyton Jones at 2025-06-13T09:51:11-04:00

Improve redundant constraints for instance decls

Addresses #25992, which showed that the default methods
of an instance decl could make GHC fail to report redundant
constraints.

Figuring out how to do this led me to refactor the computation
of redundant constraints.  See the entirely rewritten

   Note [Tracking redundant constraints]

in GHC.Tc.Solver.Solve

1d02798e

by Matthew Pickering at 2025-06-13T09:51:54-04:00

Refactor the treatment of nested Template Haskell splices

* The difference between a normal splice, a quasiquoter and implicit
splice caused by lifting is stored in the AST after renaming.

* Information that the renamer learns about splices is stored in the
relevant splice extension points (XUntypedSpliceExpr, XQuasiQuote).

* Normal splices and quasi quotes record the flavour of splice
  (exp/pat/dec etc)

* Implicit lifting stores information about why the lift was attempted,
  so if it fails, that can be reported to the user.

* After renaming, the decision taken to attempt to implicitly lift a
variable is stored in the `XXUntypedSplice` extension field in the
`HsImplicitLiftSplice` constructor.

* Since all the information is stored in the AST, in `HsUntypedSplice`,
  the type of `PendingRnSplice` now just stores a `HsUntypedSplice`.

* Error messages since the original program can be easily
  printed, this is noticeable in the case of implicit lifting.
* The user-written syntax is directly type-checked. Before, some
  desugaring took place in the
* Fixes .hie files to work better with nested splices (nested splices
  are not indexed)
* The location of the quoter in a quasiquote is now located, so error
  messages will precisely point to it (and again, it is indexed by hie
  files)

In the future, the typechecked AST should also retain information about
the splices and the specific desugaring being left to the desugarer.

Also, `runRnSplice` should call `tcUntypedSplice`, otherwise the
typechecking logic is duplicated (see the `QQError` and `QQTopError`
tests for a difference caused by this).

f93798ba

by Cheng Shao at 2025-06-13T09:52:35-04:00

libffi: update to 3.5.1

Bumps libffi submodule.

4c469768

by Alan Zimmerman at 2025-06-14T09:55:42+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

94d52516

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Tidy up before re-visiting the continuation mechanic

db9f58c9

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Switch preprocessor to continuation passing style

Proof of concept, needs tidying up

8452c145
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Small cleanup
```
c6681522
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Get rid of some cruft
```

be02e288

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Starting to integrate.

Need to get the pragma recognised and set

65c23e60

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

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

93508504
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Remove unused ITcppDefined
```

067d7ca8

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Allow spaces between # and keyword for preprocessor directive

a4545a17

by Alan Zimmerman at 2025-06-14T09:55:42+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.

321dc532

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Accumulate CPP continuations, process when ready

Can be simplified further, we only need one CPP token

31c636bb

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Simplify Lexer interface. Only ITcpp

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

42f55a97

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

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

37a58edf
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Start parsing and processing the directives
```
d8c030dd
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Prepare for processing include files
```

fff86bf5

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Move PpState into PreProcess

And initParserState, initPragState too

b38f1dcb

by Alan Zimmerman at 2025-06-14T09:55:42+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

6edae67e
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Split into separate files
```

b4a1c51a

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Starting on expression parser.

But it hangs. Time for Text.Parsec.Expr

466c4bbc

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Start integrating the ghc-cpp work

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

54a33893
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
WIP
```
1ff0299c
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Fixup after rebase
```
091ccba3
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
WIP
```
e209e8a8
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Fixup after rebase, including all tests pass
```
15fc3813
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Change pragma usage to GHC_CPP from GhcCPP
```
7e9ab2d5
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Some comments
```
0f0afba2
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Reformat
```
4612b446
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Delete unused file
```
b8d1ded0
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Rename module Parse to ParsePP
```
7e0b984c
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
Clarify naming in the parser
```

1142339c

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

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

Since Parsec is not available

64485aeb

by Alan Zimmerman at 2025-06-14T09:55:42+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

56e890df

by Alan Zimmerman at 2025-06-14T09:55:42+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
```

35571286

by Alan Zimmerman at 2025-06-14T09:55:42+01:00

Rebase, and all tests pass except whitespace for generated parser

cd41e5e9
by Alan Zimmerman at 2025-06-14T09:55:42+01:00
```
More plumbing. Ready for testing tomorrow.
```

f546d56f