diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2016-11-30 10:54:45 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-30 10:56:10 -0500 |
| commit | e2330b6dde805a5507898c3c4ddf38599df969da (patch) | |
| tree | d52c52b99f510553b2d1733d006747d75be68a6d /testsuite/tests | |
| parent | 03766cdbd26855e50719bd8ffcaf19898bd33f16 (diff) | |
| download | haskell-e2330b6dde805a5507898c3c4ddf38599df969da.tar.gz | |
Revert "Make globals use sharedCAF"
This reverts commit 6f7ed1e51bf360621a3c2a447045ab3012f68575 due to breakage of
the build on Windows.
Diffstat (limited to 'testsuite/tests')
3 files changed, 5 insertions, 1 deletions
diff --git a/testsuite/tests/plugins/LinkerTicklingPlugin.hs b/testsuite/tests/plugins/LinkerTicklingPlugin.hs index 52d5e177bb..7ee63cd7a0 100644 --- a/testsuite/tests/plugins/LinkerTicklingPlugin.hs +++ b/testsuite/tests/plugins/LinkerTicklingPlugin.hs @@ -12,4 +12,6 @@ plugin = defaultPlugin { -- or a new instance of it. If it is a new instance the staticFlags -- won't have been initialised, so we'll get a GHC panic here: install :: [CommandLineOption] -> [CoreToDo] -> CoreM [CoreToDo] -install _options todos = length staticFlags `seq` return todos +install _options todos = reinitializeGlobals >> (length staticFlags `seq` return todos) + --- XXX: remove reinitializeGlobals when we have fixed the linker + -- problem (see comment with reinitializeGlobals in CoreMonad.hs) diff --git a/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs b/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs index 55e32e5b69..883ba3ada6 100644 --- a/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs +++ b/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs @@ -13,6 +13,7 @@ plugin = defaultPlugin { install :: [CommandLineOption] -> [CoreToDo] -> CoreM [CoreToDo] install _ todo = do + reinitializeGlobals return (CoreDoPluginPass "Say name" pass : todo) pass :: ModGuts -> CoreM ModGuts diff --git a/testsuite/tests/simplCore/should_compile/T7702plugin/T7702Plugin.hs b/testsuite/tests/simplCore/should_compile/T7702plugin/T7702Plugin.hs index e411d04e67..cb6a03d394 100644 --- a/testsuite/tests/simplCore/should_compile/T7702plugin/T7702Plugin.hs +++ b/testsuite/tests/simplCore/should_compile/T7702plugin/T7702Plugin.hs @@ -8,6 +8,7 @@ plugin = defaultPlugin { installCoreToDos = install } where install :: [CommandLineOption] -> [CoreToDo] -> CoreM [CoreToDo] install _ todos = do + reinitializeGlobals putMsgS "T7702Plugin" |