diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2022-10-27 16:26:39 +0200 |
|---|---|---|
| committer | Sylvain Henry <sylvain@haskus.fr> | 2022-11-07 12:00:41 +0100 |
| commit | 75a0a2a084f5ad35c8fa846d94795022c822f42f (patch) | |
| tree | f15fcf6f16e1272f49b9131dcfe436d68dd8501f | |
| parent | 041c15ebf63e3901f68a70b18b9a74ca2133bff0 (diff) | |
| download | haskell-75a0a2a084f5ad35c8fa846d94795022c822f42f.tar.gz | |
Minor fixes after rebase
| -rw-r--r-- | compiler/GHC/Driver/Main.hs | 4 | ||||
| -rw-r--r-- | compiler/GHC/StgToJS/Linker/Linker.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/rep-poly/all.T | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/compiler/GHC/Driver/Main.hs b/compiler/GHC/Driver/Main.hs index 46802cf496..a5141f6a28 100644 --- a/compiler/GHC/Driver/Main.hs +++ b/compiler/GHC/Driver/Main.hs @@ -1857,7 +1857,7 @@ hscGenHardCode hsc_env cgguts location output_filename = do -- Hence we have one withTiming for the whole backend, the -- next withTiming after this will be "Assembler" (hard code only). withTiming logger (text "CodeGen"<+>brackets (ppr this_mod)) (const ()) - $ case backendCodeOutput (backend dflags) of + $ case backendCodeOutput (backend dflags) of JSCodeOutput -> do let js_config = initStgToJSConfig dflags @@ -1870,7 +1870,7 @@ hscGenHardCode hsc_env cgguts location output_filename = do -- do the unfortunately effectual business stgToJS logger js_config stg_binds this_mod spt_entries foreign_stubs0 cost_centre_info output_filename - return (output_filename, stub_c_exists, foreign_fps, stg_cg_infos, cmm_cg_infos) + return (output_filename, stub_c_exists, foreign_fps, Just stg_cg_infos, cmm_cg_infos) _ -> do diff --git a/compiler/GHC/StgToJS/Linker/Linker.hs b/compiler/GHC/StgToJS/Linker/Linker.hs index 808004db60..6c4b011ce9 100644 --- a/compiler/GHC/StgToJS/Linker/Linker.hs +++ b/compiler/GHC/StgToJS/Linker/Linker.hs @@ -836,13 +836,11 @@ embedJsFile logger dflags tmpfs unit_env input_fn output_fn = do { cppUseCc = True , cppLinePragmas = False -- LINE pragmas aren't JS compatible } - extra_opts = [] doCpp logger tmpfs dflags unit_env cpp_opts - extra_opts pp_fn js_fn -- add header to recognize the object as a JS file diff --git a/testsuite/tests/rep-poly/all.T b/testsuite/tests/rep-poly/all.T index 38ea5e7617..af2c31e906 100644 --- a/testsuite/tests/rep-poly/all.T +++ b/testsuite/tests/rep-poly/all.T @@ -95,7 +95,7 @@ test('UnliftedNewtypesLevityBinder', normal, compile_fail, ['']) ## ## ## These tests work! ## ## -test('T13105', js_broken(22364), compile, ['']) ## +test('T13105', js_broken(22364), compile, ['']) ## test('T17536b', normal, compile, ['']) ## ## ## These don't! ## |