Jaro Reinders pushed to branch wip/T17521 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/CoreToStg/Prep.hs
    ... ... @@ -2257,8 +2257,8 @@ decideFloatInfo FIA{fia_levity=lev, fia_demand=dmd, fia_is_hnf=is_hnf,
    2257 2257
       | is_string             = (CaseBound, TopLvlFloatable)
    
    2258 2258
           -- String literals are unboxed (so must be case-bound) and float to
    
    2259 2259
           -- the top-level
    
    2260
    -  | ok_for_spec           = (CaseBound, case lev of Unlifted -> LazyContextFloatable
    
    2261
    -                                                    Lifted   -> TopLvlFloatable)
    
    2260
    +  -- TODO: figre out if ok_for_spec is a good enough predicate for floating unlifted bindings
    
    2261
    +  | ok_for_spec           = (CaseBound, TopLvlFloatable)
    
    2262 2262
           -- See Note [Speculative evaluation]
    
    2263 2263
           -- Ok-for-spec-eval things will be case-bound, lifted or not.
    
    2264 2264
           -- But when it's lifted we are ok with floating it to top-level
    

  • compiler/ghc-llvm-version.h deleted
    1
    -/* compiler/ghc-llvm-version.h.  Generated from ghc-llvm-version.h.in by configure.  */
    
    2
    -#if !defined(__GHC_LLVM_VERSION_H__)
    
    3
    -#define __GHC_LLVM_VERSION_H__
    
    4
    -
    
    5
    -/* The maximum supported LLVM version number */
    
    6
    -#define sUPPORTED_LLVM_VERSION_MAX (16)
    
    7
    -
    
    8
    -/* The minimum supported LLVM version number */
    
    9
    -#define sUPPORTED_LLVM_VERSION_MIN (11)
    
    10
    -
    
    11
    -#endif /* __GHC_LLVM_VERSION_H__ */