Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/Iface/Tidy/StaticPtrTable.hs
    ... ... @@ -17,18 +17,18 @@
    17 17
     -- > static void hs_hpc_init_Main(void) {
    
    18 18
     -- >
    
    19 19
     -- >   static StgWord64 k0[2] = {16252233372134256ULL,7370534374096082ULL};
    
    20
    --- >   extern StgPtr Main_r2wb_closure;
    
    20
    +-- >   extern StgClosure Main_r2wb_closure;
    
    21 21
     -- >   hs_spt_insert(k0, &Main_r2wb_closure);
    
    22 22
     -- >
    
    23 23
     -- >   static StgWord64 k1[2] = {12545634534567898ULL,5409674567544151ULL};
    
    24
    --- >   extern StgPtr Main_r2wc_closure;
    
    24
    +-- >   extern StgClosure Main_r2wc_closure;
    
    25 25
     -- >   hs_spt_insert(k1, &Main_r2wc_closure);
    
    26 26
     -- >
    
    27 27
     -- > }
    
    28 28
     --
    
    29 29
     -- where the constants are fingerprints produced from the static forms.
    
    30 30
     --
    
    31
    --- The linker must find the definitions matching the @extern StgPtr <name>@
    
    31
    +-- The linker must find the definitions matching the @extern StgClosure <name>@
    
    32 32
     -- declarations. For this to work, the identifiers of static pointers need to be
    
    33 33
     -- exported. This is done in 'GHC.Core.Opt.SetLevels.newLvlVar'.
    
    34 34
     --
    
    ... ... @@ -263,7 +263,7 @@ sptModuleInitCode platform this_mod entries
    263 263
             -- CLabel. Regardless, MayHaveCafRefs/NoCafRefs wouldn't make
    
    264 264
             -- any difference here, they would pretty-print to the same
    
    265 265
             -- foreign stub content.
    
    266
    -        $$ text "extern StgPtr "
    
    266
    +        $$ text "extern StgClosure "
    
    267 267
                <> (pprCLabel platform $ mkClosureLabel n MayHaveCafRefs) <> semi
    
    268 268
             $$ text "hs_spt_insert" <> parens
    
    269 269
                  (hcat $ punctuate comma