[Git][ghc/ghc][wip/az/ghc-cpp] 71 commits: wasm: add Note [Variable passing in JSFFI] as !13583 follow up
Alan Zimmerman (@alanz)
gitlab at gitlab.haskell.org
Thu Feb 27 22:28:07 UTC 2025
Alan Zimmerman pushed to branch wip/az/ghc-cpp at Glasgow Haskell Compiler / GHC
Commits:
f3bfe31e by Cheng Shao at 2025-02-23T14:06:25-05:00
wasm: add Note [Variable passing in JSFFI] as !13583 follow up
This patch adds a note to explain how the magic variables like
`__ghc_wasm_jsffi_dyld` are brought into scope of JSFFI code snippets,
as follow up work of !13583.
- - - - -
c318be56 by Cheng Shao at 2025-02-23T14:07:02-05:00
libffi: update to 3.4.7
Bumps libffi submodule.
- - - - -
33aca30f by sheaf at 2025-02-25T08:58:46-05:00
LLVM: account for register type in funPrologue
We were not properly accounting for the live register type of
global registers in GHC.CmmToLlvm.CodeGen.funPrologue. This meant that
we could allocated a register at type <4 x i32> but try to write to it
at type <8 x i16>, which LLVM doesn't much like.
This patch fixes that by inserting intermerdiate casts when necessary.
Fixes #25730
- - - - -
0eb58b0e by sheaf at 2025-02-25T08:59:29-05:00
base: make Data.List.NonEmpty.unzip match Data.List
This commit makes Data.List.NonEmpty.unzip match the implementation
of Data.List, as was suggested in approved CLC proposal #107.
- - - - -
f4da90f1 by Matthew Pickering at 2025-02-25T14:11:21-05:00
interpreter: Fix underflow frame lookups
BCOs can be nested, resulting in nested BCO stack frames where the inner most
stack frame can refer to variables stored on earlier stack frames via the
PUSH_L instruction.
|---------|
| BCO_1 | -<-┐
|---------|
......... |
|---------| | PUSH_L <n>
| BCO_N | ->-┘
|---------|
Here BCO_N is syntactically nested within the code for BCO_1 and will result
in code that references the prior stack frame of BCO_1 for some of it's local
variables. If a stack overflow happens between the creation of the stack frame
for BCO_1 and BCO_N the RTS might move BCO_N to a new stack chunk while leaving
BCO_1 in place, invalidating a simple offset based reference to the outer stack
frames.
Therefore `ReadSpW` first performs a bounds check to ensure that accesses onto
the stack will succeed. If the target address would not be a valid location for
the current stack chunk then `slow_spw` function is called, which dereferences
the underflow frame to adjust the offset before performing the lookup.
┌->--x | CHK_1 |
| CHK_2 | | | |---------|
|---------| | └-> | BCO_1 |
| UD_FLOW | -- x |---------|
|---------| |
| ...... | |
|---------| | PUSH_L <n>
| BCO_ N | ->-┘
|---------|
Fixes #25750
- - - - -
c3f2d284 by Vladislav Zavialov at 2025-02-25T14:11:58-05:00
Remove ArgPatBuilder
ArgPatBuilder in Parser/PostProcess.hs became redundant with the
introduction of InvisPat (36a75b80eb).
This small refactoring removes it.
- - - - -
2be8f703 by Alan Zimmerman at 2025-02-25T20:24:37+00: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
- - - - -
51cfc3ce by Alan Zimmerman at 2025-02-25T20:24:37+00:00
Tidy up before re-visiting the continuation mechanic
- - - - -
284c33ca by Alan Zimmerman at 2025-02-25T20:24:37+00:00
Switch preprocessor to continuation passing style
Proof of concept, needs tidying up
- - - - -
2f408f7d by Alan Zimmerman at 2025-02-25T20:24:37+00:00
Small cleanup
- - - - -
8ad39898 by Alan Zimmerman at 2025-02-25T20:24:37+00:00
Get rid of some cruft
- - - - -
f57d8862 by Alan Zimmerman at 2025-02-25T20:24:37+00:00
Starting to integrate.
Need to get the pragma recognised and set
- - - - -
942bb2fd by Alan Zimmerman at 2025-02-25T20:24:37+00:00
Make cppTokens extend to end of line, and process CPP comments
- - - - -
f4c98fa5 by Alan Zimmerman at 2025-02-25T20:24:38+00:00
Remove unused ITcppDefined
- - - - -
e6d0e3a2 by Alan Zimmerman at 2025-02-25T20:24:38+00:00
Allow spaces between # and keyword for preprocessor directive
- - - - -
2057f04e by Alan Zimmerman at 2025-02-25T20:24:38+00: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.
- - - - -
3c30285f by Alan Zimmerman at 2025-02-25T20:24:38+00:00
Accumulate CPP continuations, process when ready
Can be simplified further, we only need one CPP token
- - - - -
ba831267 by Alan Zimmerman at 2025-02-25T20:24:38+00:00
Simplify Lexer interface. Only ITcpp
We transfer directive lines through it, then parse them from scratch
in the preprocessor.
- - - - -
38e2aea7 by Alan Zimmerman at 2025-02-25T20:24:38+00:00
Deal with directive on last line, with no trailing \n
- - - - -
21f779c5 by Alan Zimmerman at 2025-02-25T20:24:38+00:00
Start parsing and processing the directives
- - - - -
17c22c9c by Alan Zimmerman at 2025-02-25T20:24:38+00:00
Prepare for processing include files
- - - - -
32fcac19 by Alan Zimmerman at 2025-02-25T20:25:59+00:00
Move PpState into PreProcess
And initParserState, initPragState too
- - - - -
58351665 by Alan Zimmerman at 2025-02-25T20:26:05+00: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
- - - - -
2756cffc by Alan Zimmerman at 2025-02-25T20:26:05+00:00
Split into separate files
- - - - -
fbceb316 by Alan Zimmerman at 2025-02-25T20:26:05+00:00
Starting on expression parser.
But it hangs. Time for Text.Parsec.Expr
- - - - -
67c73250 by Alan Zimmerman at 2025-02-25T20:26:05+00:00
Start integrating the ghc-cpp work
>From https://github.com/alanz/ghc-cpp
- - - - -
8073234d by Alan Zimmerman at 2025-02-25T20:26:06+00:00
WIP
- - - - -
c24c2c10 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Fixup after rebase
- - - - -
89e4d7d9 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
WIP
- - - - -
2e63f160 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Fixup after rebase, including all tests pass
- - - - -
03cf514e by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Change pragma usage to GHC_CPP from GhcCPP
- - - - -
67fbdf76 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Some comments
- - - - -
bc0b036f by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Reformat
- - - - -
05c46cdd by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Delete unused file
- - - - -
96c58c0e by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Rename module Parse to ParsePP
- - - - -
a39b5625 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Clarify naming in the parser
- - - - -
ee45c7cb by Alan Zimmerman at 2025-02-25T20:26:06+00:00
WIP. Switching to alex/happy to be able to work in-tree
Since Parsec is not available
- - - - -
6923210b by Alan Zimmerman at 2025-02-25T20:26:06+00: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
- - - - -
a9c27b09 by Alan Zimmerman at 2025-02-25T20:26:06+00: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
```
- - - - -
3c4064cd by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Rebase, and all tests pass except whitespace for generated parser
- - - - -
7e089acb by Alan Zimmerman at 2025-02-25T20:26:06+00:00
More plumbing. Ready for testing tomorrow.
- - - - -
9202b0f7 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Proress. Renamed module State from Types
And at first blush it seems to handle preprocessor scopes properly.
- - - - -
fdf8c8a1 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Insert basic GHC version macros into parser
__GLASGOW_HASKELL__
__GLASGOW_HASKELL_FULL_VERSION__
__GLASGOW_HASKELL_PATCHLEVEL1__
__GLASGOW_HASKELL_PATCHLEVEL2__
- - - - -
a90e9245 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Re-sync check-cpp for easy ghci work
- - - - -
c1a023c4 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Get rid of warnings
- - - - -
5cf08254 by Alan Zimmerman at 2025-02-25T20:26:06+00: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
- - - - -
f9405a86 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
WIP. Can crack arguments for #define
Next step it to crack out args in an expansion
- - - - -
a04f7d5d by Alan Zimmerman at 2025-02-25T20:26:06+00:00
WIP on arg parsing.
- - - - -
13bad69b by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Progress. Still screwing up nested parens.
- - - - -
0c37da25 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Seems to work, but has redundant code
- - - - -
7fa021de by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Remove redundant code
- - - - -
c6d7e92c by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Reformat
- - - - -
dd569a83 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Expand args, single pass
Still need to repeat until fixpoint
- - - - -
af6e9fb7 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Fixed point expansion
- - - - -
62539396 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Sync the playground to compiler
- - - - -
47ce9925 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Working on dumping the GHC_CPP result
But We need to keep the BufSpan in a comment
- - - - -
e06a9d80 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Keep BufSpan in queued comments in GHC.Parser.Lexer
- - - - -
baf851f9 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Getting close to being able to print the combined tokens
showing what is in and what is out
- - - - -
28f6dbf4 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
First implementation of dumpGhcCpp.
Example output
First dumps all macros in the state, then the source, showing which
lines are in and which are out
------------------------------
- |#define FOO(A,B) A + B
- |#define FOO(A,B,C) A + B + C
- |#if FOO(1,FOO(3,4)) == 8
- |-- a comment
|x = 1
- |#else
- |x = 5
- |#endif
- - - - -
fdc536a3 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Clean up a bit
- - - - -
465aed49 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Add -ddump-ghc-cpp option and a test based on it
- - - - -
b15feb45 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Restore Lexer.x rules, we need them for continuation lines
- - - - -
301446ba by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Lexer.x: trying to sort out the span for continuations
- We need to match on \n at the end of the line
- We cannot simply back up for it
- - - - -
af27c429 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Inserts predefined macros. But does not dump properly
Because the cpp tokens have a trailing newline
- - - - -
1ba86ca9 by Alan Zimmerman at 2025-02-25T20:26:06+00:00
Remove unnecessary LExer rules
We *need* the ones that explicitly match to the end of the line.
- - - - -
0bd89fd5 by Alan Zimmerman at 2025-02-25T20:26:07+00:00
Generate correct span for ITcpp
Dump now works, except we do not render trailing `\` for continuation
lines. This is good enough for use in test output.
- - - - -
6810d6c4 by Alan Zimmerman at 2025-02-25T20:26:07+00:00
Reduce duplication in lexer
- - - - -
d66d7d7d by Alan Zimmerman at 2025-02-25T20:26:07+00:00
Tweaks
- - - - -
af93a804 by Alan Zimmerman at 2025-02-25T20:26:07+00:00
Insert min_version predefined macros into state
The mechanism now works. Still need to flesh out the full set.
- - - - -
50725064 by Alan Zimmerman at 2025-02-25T20:26:07+00:00
Trying my alternative pragma syntax.
It works, but dumpGhcCpp is broken, I suspect from the ITcpp token
span update.
- - - - -
b5089bc8 by Alan Zimmerman at 2025-02-27T22:26:31+00:00
Pragma extraction now works, with both CPP and GHC_CPP
For the following
{-# LANGUAGE CPP #-}
#if __GLASGOW_HASKELL__ >= 913
{-# LANGUAGE GHC_CPP #-}
#endif
We will enable GHC_CPP only
- - - - -
83 changed files:
- compiler/GHC.hs
- compiler/GHC/Cmm/Lexer.x
- compiler/GHC/Cmm/Parser.y
- compiler/GHC/Cmm/Parser/Monad.hs
- compiler/GHC/Cmm/Reg.hs
- compiler/GHC/CmmToLlvm/Base.hs
- compiler/GHC/CmmToLlvm/CodeGen.hs
- compiler/GHC/Driver/Backpack.hs
- compiler/GHC/Driver/Config/Parser.hs
- compiler/GHC/Driver/Flags.hs
- compiler/GHC/Driver/Main.hs
- compiler/GHC/Driver/Make.hs
- compiler/GHC/Driver/Pipeline.hs
- compiler/GHC/Driver/Pipeline/Execute.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Llvm/Types.hs
- compiler/GHC/Parser.hs-boot
- compiler/GHC/Parser.y
- compiler/GHC/Parser/Annotation.hs
- compiler/GHC/Parser/HaddockLex.x
- compiler/GHC/Parser/Header.hs
- compiler/GHC/Parser/Lexer.x
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Parser/PostProcess/Haddock.hs
- + compiler/GHC/Parser/PreProcess.hs
- + compiler/GHC/Parser/PreProcess/Eval.hs
- + compiler/GHC/Parser/PreProcess/Lexer.x
- + compiler/GHC/Parser/PreProcess/Macro.hs
- + compiler/GHC/Parser/PreProcess/ParsePP.hs
- + compiler/GHC/Parser/PreProcess/Parser.y
- + compiler/GHC/Parser/PreProcess/ParserM.hs
- + compiler/GHC/Parser/PreProcess/State.hs
- compiler/GHC/Parser/Utils.hs
- compiler/GHC/SysTools/Cpp.hs
- compiler/ghc.cabal.in
- docs/users_guide/debugging.rst
- ghc/GHCi/UI.hs
- hadrian/src/Rules/SourceDist.hs
- hadrian/stack.yaml.lock
- libffi-tarballs
- libraries/base/src/Data/List/NonEmpty.hs
- libraries/ghc-internal/src/GHC/Internal/LanguageExtensions.hs
- libraries/ghci/GHCi/ObjLink.hs
- rts/Interpreter.c
- testsuite/tests/count-deps/CountDepsParser.stdout
- testsuite/tests/driver/T4437.hs
- testsuite/tests/ghc-api/T11579.hs
- + testsuite/tests/ghc-cpp/GhcCpp01.hs
- + testsuite/tests/ghc-cpp/GhcCpp01.stderr
- + testsuite/tests/ghc-cpp/all.T
- testsuite/tests/interface-stability/template-haskell-exports.stdout
- testsuite/tests/linters/notes.stdout
- + testsuite/tests/llvm/should_run/T25730.hs
- + testsuite/tests/llvm/should_run/T25730.stdout
- + testsuite/tests/llvm/should_run/T25730C.c
- testsuite/tests/llvm/should_run/all.T
- + utils/check-cpp/.ghci
- + utils/check-cpp/.gitignore
- + utils/check-cpp/Eval.hs
- + utils/check-cpp/Example1.hs
- + utils/check-cpp/Example2.hs
- + utils/check-cpp/Example3.hs
- + utils/check-cpp/Example4.hs
- + utils/check-cpp/Lexer.x
- + utils/check-cpp/Macro.hs
- + utils/check-cpp/Main.hs
- + utils/check-cpp/ParsePP.hs
- + utils/check-cpp/ParseSimulate.hs
- + utils/check-cpp/Parser.y
- + utils/check-cpp/ParserM.hs
- + utils/check-cpp/PreProcess.hs
- + utils/check-cpp/README.md
- + utils/check-cpp/State.hs
- + utils/check-cpp/run.sh
- utils/check-exact/Main.hs
- utils/check-exact/Parsers.hs
- utils/check-exact/Preprocess.hs
- utils/check-exact/Utils.hs
- utils/haddock/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
- utils/haddock/haddock-api/src/Haddock/Parser.hs
- utils/haddock/haddock-api/src/Haddock/Types.hs
- utils/jsffi/dyld.mjs
- utils/jsffi/post-link.mjs
The diff was not included because it is too large.
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b91a28c1027428a2ef7170451b312b7be6cd83b1...b5089bc8b3e9be63a001175c726e1668fbbe3cbb
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b91a28c1027428a2ef7170451b312b7be6cd83b1...b5089bc8b3e9be63a001175c726e1668fbbe3cbb
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/20250227/df6f85aa/attachment-0001.html>
More information about the ghc-commits
mailing list