Date: Tuesday, September 21, 2021 @ 22:49:23 Author: felixonmars Revision: 1021187
archrelease: copy trunk to community-testing-x86_64 Added: ghc/repos/community-testing-x86_64/PKGBUILD (from rev 1021186, ghc/trunk/PKGBUILD) ghc/repos/community-testing-x86_64/a02fbadaf59521b5f1af3f05b45933b245093531.patch (from rev 1021186, ghc/trunk/a02fbadaf59521b5f1af3f05b45933b245093531.patch) ghc/repos/community-testing-x86_64/ghc-rebuild-doc-index.hook (from rev 1021186, ghc/trunk/ghc-rebuild-doc-index.hook) ghc/repos/community-testing-x86_64/ghc-register.hook (from rev 1021186, ghc/trunk/ghc-register.hook) ghc/repos/community-testing-x86_64/ghc-unregister.hook (from rev 1021186, ghc/trunk/ghc-unregister.hook) ghc/repos/community-testing-x86_64/ghc.install (from rev 1021186, ghc/trunk/ghc.install) ghc/repos/community-testing-x86_64/print-provides-replaces.sh (from rev 1021186, ghc/trunk/print-provides-replaces.sh) Deleted: ghc/repos/community-testing-x86_64/PKGBUILD ghc/repos/community-testing-x86_64/a02fbadaf59521b5f1af3f05b45933b245093531.patch ghc/repos/community-testing-x86_64/ghc-rebuild-doc-index.hook ghc/repos/community-testing-x86_64/ghc-register.hook ghc/repos/community-testing-x86_64/ghc-unregister.hook ghc/repos/community-testing-x86_64/ghc.install ghc/repos/community-testing-x86_64/print-provides-replaces.sh ------------------------------------------------+ PKGBUILD | 404 +++++++++++------------ a02fbadaf59521b5f1af3f05b45933b245093531.patch | 264 +++++++-------- ghc-rebuild-doc-index.hook | 28 - ghc-register.hook | 24 - ghc-unregister.hook | 24 - ghc.install | 24 - print-provides-replaces.sh | 106 +++--- 7 files changed, 437 insertions(+), 437 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-09-21 22:48:48 UTC (rev 1021186) +++ PKGBUILD 2021-09-21 22:49:23 UTC (rev 1021187) @@ -1,202 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Vesa Kaihlavirta <v...@archlinux.org> -# Contributor: Thomas Dziedzic <gos...@gmail.com> - -# Special note for devs looking to upgrade this package: -# ghc places a unique hash for each library when it is built. -# Libraries depend on versions specified by those hashes. -# This implies that all libraries need to be rebuilt when ghc is rebuilt. - -shopt -s extglob - -pkgbase=ghc -pkgname=(ghc-libs ghc ghc-static) -pkgver=9.0.1 -pkgrel=3 -pkgdesc='The Glasgow Haskell Compiler' -arch=('x86_64') -url='https://www.haskell.org/ghc/' -license=('custom') -makedepends=('ghc-static' 'perl' 'libxslt' 'docbook-xsl' 'python-sphinx' 'haskell-hscolour' - 'texlive-bin' 'texlive-latexextra' 'ttf-dejavu' 'alex' 'happy' 'time' 'numactl') -source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgbase-${pkgver}-src.tar.xz" - a02fbadaf59521b5f1af3f05b45933b245093531.patch - ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook) -noextract=("$pkgbase-${pkgver}-src.tar.xz") -sha512sums=('bee7950a5118be8d8cefe0db5070139a5a93ca21c5bc6f8bf453429831f0c44f5e0fb5ee569865d6b8b92749044ee4123be06920928ac7a1ec9cffa9404a3e53' - '8523a5fef22e391c668e315d115792c90de072e817f7a171e0c94e360684536e5c75eabe8a02ca73029431fb32462096bbdf6b8210dc862f72a79e28ec0ca27a' - 'd69e5222d1169c4224a2b69a13e57fdd574cb1b5932b15f4bc6c7d269a9658dd87acb1be81f52fbcf3cb64f96978b9943d10cee2c21bff0565aaa93a5d35fcae' - '5f659651d8e562a4dcaae0f821d272d6e9c648b645b1d6ab1af61e4dd690dc5a4b9c6846753b7f935963f001bb1ae1f40cd77731b71ef5a8dbc079a360aa3f8f' - '3bdbd05c4a2c4fce4adf6802ff99b1088bdfad63da9ebfc470af9e271c3dd796f86fba1cf319d8f4078054d85c6d9e6a01f79994559f24cc77ee1a25724af2e6') - -prepare() { - # Need to extract this tarball with a UTF-8 locale instead of a chroot's "C" - # locale; otherwise we get: - # bsdtar: Pathname can't be converted from UTF-8 to current locale. - LANG=en_US.UTF-8 bsdtar xf $pkgbase-${pkgver}-src.tar.xz - - cd ghc-$pkgver - - # https://gitlab.haskell.org/ghc/ghc/-/issues/19976 - patch -p1 -i ../a02fbadaf59521b5f1af3f05b45933b245093531.patch - - cp mk/build.mk{.sample,} - sed -i '1iBuildFlavour = perf' mk/build.mk -} - -build() { - cd ghc-$pkgver - - ./configure \ - --prefix=/usr \ - --docdir=/usr/share/doc/ghc \ - --with-system-libffi \ - --with-ffi-includes=$(pkg-config --variable=includedir libffi) - make -} - -package_ghc-static() { - pkgdesc='The Glasgow Haskell Compiler - Static Libraries and Documentation' - depends=('ghc') - - cd ghc-$pkgver - - make DESTDIR="$pkgdir" -j1 install - - mv "$pkgdir"/usr/lib/ghc-$pkgver/package.conf.d "$srcdir"/static-package.conf.d - find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -type f -delete - find "$pkgdir"/usr/lib -type d -empty -delete - mv "$srcdir"/static-package.conf.d "$pkgdir"/usr/lib/ghc-$pkgver/ - rm -r "$pkgdir"/usr/bin "$pkgdir"/usr/share/man - - install -Dm644 "$srcdir"/ghc-rebuild-doc-index.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-rebuild-doc-index.hook -} - -package_ghc() { - pkgdesc='The Glasgow Haskell Compiler' - depends=('gcc' 'ghc-libs') - provides=('haskell-haddock=2.24.0' - 'haskell-hp2ps=0.1' - 'haskell-hpc-bin=0.68' - 'haskell-hsc2hs=0.68.7') - replaces=('haskell-haddock' - 'haskell-hp2ps' - 'haskell-hpc-bin' - 'haskell-hsc2hs') - - provides+=("haskell-ghc=$pkgver") - replaces+=("haskell-ghc") - - cd ghc-$pkgver - make DESTDIR="$pkgdir" -j1 install - - # Remove static libs - find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -delete - - # ghc-pkg is in ghc-libs - rm "$pkgdir"/usr/lib/ghc-$pkgver/bin/ghc-pkg* - rm "$pkgdir"/usr/bin/ghc-pkg* - (cd "$pkgdir"/usr/lib/ghc-$pkgver; rm -r !(bin|ghc-$pkgver)) - - # docs moved to ghc-static - rm -r "$pkgdir"/usr/share/doc - - install -Dm644 utils/completion/ghc.bash \ - "$pkgdir/usr/share/bash-completion/completions/ghc" -} - -package_ghc-libs() { - pkgdesc='The Glasgow Haskell Compiler - Dynamic Libraries' - install='ghc.install' - depends=('gmp' 'libffi' 'numactl' 'perl') - provides=('haskell-array=0.5.4.0' - 'haskell-base=4.15.0.0' - 'haskell-binary=0.8.8.0' - 'haskell-bytestring=0.10.12.1' - 'haskell-cabal=3.4.0.0' - 'haskell-containers=0.6.4.1' - 'haskell-deepseq=1.4.5.0' - 'haskell-directory=1.3.6.1' - 'haskell-exceptions=0.10.4' - 'haskell-filepath=1.4.2.1' - 'haskell-ghc-bignum=1.0' - 'haskell-ghc-boot=9.0.1' - 'haskell-ghc-boot-th=9.0.1' - 'haskell-ghc-compact=0.1.0.0' - 'haskell-ghc-heap=9.0.1' - 'haskell-ghc-prim=0.7.0' - 'haskell-haskeline=0.8.1.0' - 'haskell-hpc=0.6.1.0' - 'haskell-integer-gmp=1.1' - 'haskell-libiserv=9.0.1' - 'haskell-mtl=2.2.2' - 'haskell-parsec=3.1.14.0' - 'haskell-pretty=1.1.3.6' - 'haskell-process=1.6.11.0' - 'haskell-stm=2.5.0.0' - 'haskell-template-haskell=2.17.0.0' - 'haskell-terminfo=0.4.1.4' - 'haskell-text=1.2.4.1' - 'haskell-time=1.9.3' - 'haskell-transformers=0.5.6.2' - 'haskell-unix=2.7.2.2' - 'haskell-xhtml=3000.2.2.1' - 'haskell-ghc-pkg=6.9') - replaces=('haskell-array' - 'haskell-base' - 'haskell-binary' - 'haskell-bytestring' - 'haskell-cabal' - 'haskell-containers' - 'haskell-deepseq' - 'haskell-directory' - 'haskell-exceptions' - 'haskell-filepath' - 'haskell-ghc-bignum' - 'haskell-ghc-boot' - 'haskell-ghc-boot-th' - 'haskell-ghc-compact' - 'haskell-ghc-heap' - 'haskell-ghc-prim' - 'haskell-haskeline' - 'haskell-hpc' - 'haskell-integer-gmp' - 'haskell-libiserv' - 'haskell-mtl' - 'haskell-parsec' - 'haskell-pretty' - 'haskell-process' - 'haskell-stm' - 'haskell-template-haskell' - 'haskell-terminfo' - 'haskell-text' - 'haskell-time' - 'haskell-transformers' - 'haskell-unix' - 'haskell-xhtml' - 'haskell-ghc-pkg') - provides+=("haskell-ghci=$pkgver") - conflicts+=('haskell-ghci') - - cd ghc-$pkgver - - make DESTDIR="$pkgdir" -j1 install - - # Remove static libs - find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -delete - - # ghc library and other exes are in the ghc package - rm -r "$pkgdir"/usr/lib/ghc-$pkgver/ghc-$pkgver - (cd "$pkgdir"/usr/lib/ghc-$pkgver/bin; rm !(ghc-pkg*)) - (cd "$pkgdir"/usr/bin; rm !(ghc-pkg*)) - - # docs moved to ghc-static - rm -r "$pkgdir"/usr/share/{man,doc} - - install -Dm644 "$srcdir"/ghc-register.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-register.hook - install -Dm644 "$srcdir"/ghc-unregister.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-unregister.hook - - install -dm755 "$pkgdir"/usr/share/haskell/{register,unregister} - - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} Copied: ghc/repos/community-testing-x86_64/PKGBUILD (from rev 1021186, ghc/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-09-21 22:49:23 UTC (rev 1021187) @@ -0,0 +1,202 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Vesa Kaihlavirta <v...@archlinux.org> +# Contributor: Thomas Dziedzic <gos...@gmail.com> + +# Special note for devs looking to upgrade this package: +# ghc places a unique hash for each library when it is built. +# Libraries depend on versions specified by those hashes. +# This implies that all libraries need to be rebuilt when ghc is rebuilt. + +shopt -s extglob + +pkgbase=ghc +pkgname=(ghc-libs ghc ghc-static) +pkgver=9.0.1 +pkgrel=4 +pkgdesc='The Glasgow Haskell Compiler' +arch=('x86_64') +url='https://www.haskell.org/ghc/' +license=('custom') +makedepends=('ghc-static' 'perl' 'libxslt' 'docbook-xsl' 'python-sphinx' 'haskell-hscolour' + 'texlive-bin' 'texlive-latexextra' 'ttf-dejavu' 'alex' 'happy' 'time' 'numactl' 'llvm') +source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgbase-${pkgver}-src.tar.xz" + a02fbadaf59521b5f1af3f05b45933b245093531.patch + ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook) +noextract=("$pkgbase-${pkgver}-src.tar.xz") +sha512sums=('bee7950a5118be8d8cefe0db5070139a5a93ca21c5bc6f8bf453429831f0c44f5e0fb5ee569865d6b8b92749044ee4123be06920928ac7a1ec9cffa9404a3e53' + '8523a5fef22e391c668e315d115792c90de072e817f7a171e0c94e360684536e5c75eabe8a02ca73029431fb32462096bbdf6b8210dc862f72a79e28ec0ca27a' + 'd69e5222d1169c4224a2b69a13e57fdd574cb1b5932b15f4bc6c7d269a9658dd87acb1be81f52fbcf3cb64f96978b9943d10cee2c21bff0565aaa93a5d35fcae' + '5f659651d8e562a4dcaae0f821d272d6e9c648b645b1d6ab1af61e4dd690dc5a4b9c6846753b7f935963f001bb1ae1f40cd77731b71ef5a8dbc079a360aa3f8f' + '3bdbd05c4a2c4fce4adf6802ff99b1088bdfad63da9ebfc470af9e271c3dd796f86fba1cf319d8f4078054d85c6d9e6a01f79994559f24cc77ee1a25724af2e6') + +prepare() { + # Need to extract this tarball with a UTF-8 locale instead of a chroot's "C" + # locale; otherwise we get: + # bsdtar: Pathname can't be converted from UTF-8 to current locale. + LANG=en_US.UTF-8 bsdtar xf $pkgbase-${pkgver}-src.tar.xz + + cd ghc-$pkgver + + # https://gitlab.haskell.org/ghc/ghc/-/issues/19976 + patch -p1 -i ../a02fbadaf59521b5f1af3f05b45933b245093531.patch + + cp mk/build.mk{.sample,} + sed -i '1iBuildFlavour = perf-llvm' mk/build.mk +} + +build() { + cd ghc-$pkgver + + ./configure \ + --prefix=/usr \ + --docdir=/usr/share/doc/ghc \ + --with-system-libffi \ + --with-ffi-includes=$(pkg-config --variable=includedir libffi) + make +} + +package_ghc-static() { + pkgdesc='The Glasgow Haskell Compiler - Static Libraries and Documentation' + depends=('ghc') + + cd ghc-$pkgver + + make DESTDIR="$pkgdir" -j1 install + + mv "$pkgdir"/usr/lib/ghc-$pkgver/package.conf.d "$srcdir"/static-package.conf.d + find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -type f -delete + find "$pkgdir"/usr/lib -type d -empty -delete + mv "$srcdir"/static-package.conf.d "$pkgdir"/usr/lib/ghc-$pkgver/ + rm -r "$pkgdir"/usr/bin "$pkgdir"/usr/share/man + + install -Dm644 "$srcdir"/ghc-rebuild-doc-index.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-rebuild-doc-index.hook +} + +package_ghc() { + pkgdesc='The Glasgow Haskell Compiler' + depends=('gcc' 'ghc-libs' 'llvm') + provides=('haskell-haddock=2.24.0' + 'haskell-hp2ps=0.1' + 'haskell-hpc-bin=0.68' + 'haskell-hsc2hs=0.68.7') + replaces=('haskell-haddock' + 'haskell-hp2ps' + 'haskell-hpc-bin' + 'haskell-hsc2hs') + + provides+=("haskell-ghc=$pkgver") + replaces+=("haskell-ghc") + + cd ghc-$pkgver + make DESTDIR="$pkgdir" -j1 install + + # Remove static libs + find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -delete + + # ghc-pkg is in ghc-libs + rm "$pkgdir"/usr/lib/ghc-$pkgver/bin/ghc-pkg* + rm "$pkgdir"/usr/bin/ghc-pkg* + (cd "$pkgdir"/usr/lib/ghc-$pkgver; rm -r !(bin|ghc-$pkgver)) + + # docs moved to ghc-static + rm -r "$pkgdir"/usr/share/doc + + install -Dm644 utils/completion/ghc.bash \ + "$pkgdir/usr/share/bash-completion/completions/ghc" +} + +package_ghc-libs() { + pkgdesc='The Glasgow Haskell Compiler - Dynamic Libraries' + install='ghc.install' + depends=('gmp' 'libffi' 'numactl' 'perl') + provides=('haskell-array=0.5.4.0' + 'haskell-base=4.15.0.0' + 'haskell-binary=0.8.8.0' + 'haskell-bytestring=0.10.12.1' + 'haskell-cabal=3.4.0.0' + 'haskell-containers=0.6.4.1' + 'haskell-deepseq=1.4.5.0' + 'haskell-directory=1.3.6.1' + 'haskell-exceptions=0.10.4' + 'haskell-filepath=1.4.2.1' + 'haskell-ghc-bignum=1.0' + 'haskell-ghc-boot=9.0.1' + 'haskell-ghc-boot-th=9.0.1' + 'haskell-ghc-compact=0.1.0.0' + 'haskell-ghc-heap=9.0.1' + 'haskell-ghc-prim=0.7.0' + 'haskell-haskeline=0.8.1.0' + 'haskell-hpc=0.6.1.0' + 'haskell-integer-gmp=1.1' + 'haskell-libiserv=9.0.1' + 'haskell-mtl=2.2.2' + 'haskell-parsec=3.1.14.0' + 'haskell-pretty=1.1.3.6' + 'haskell-process=1.6.11.0' + 'haskell-stm=2.5.0.0' + 'haskell-template-haskell=2.17.0.0' + 'haskell-terminfo=0.4.1.4' + 'haskell-text=1.2.4.1' + 'haskell-time=1.9.3' + 'haskell-transformers=0.5.6.2' + 'haskell-unix=2.7.2.2' + 'haskell-xhtml=3000.2.2.1' + 'haskell-ghc-pkg=6.9') + replaces=('haskell-array' + 'haskell-base' + 'haskell-binary' + 'haskell-bytestring' + 'haskell-cabal' + 'haskell-containers' + 'haskell-deepseq' + 'haskell-directory' + 'haskell-exceptions' + 'haskell-filepath' + 'haskell-ghc-bignum' + 'haskell-ghc-boot' + 'haskell-ghc-boot-th' + 'haskell-ghc-compact' + 'haskell-ghc-heap' + 'haskell-ghc-prim' + 'haskell-haskeline' + 'haskell-hpc' + 'haskell-integer-gmp' + 'haskell-libiserv' + 'haskell-mtl' + 'haskell-parsec' + 'haskell-pretty' + 'haskell-process' + 'haskell-stm' + 'haskell-template-haskell' + 'haskell-terminfo' + 'haskell-text' + 'haskell-time' + 'haskell-transformers' + 'haskell-unix' + 'haskell-xhtml' + 'haskell-ghc-pkg') + provides+=("haskell-ghci=$pkgver") + conflicts+=('haskell-ghci') + + cd ghc-$pkgver + + make DESTDIR="$pkgdir" -j1 install + + # Remove static libs + find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.o" -o -name "*.p_o" -o -name "*.p_hi" -o -name "*.hi" \) -delete + + # ghc library and other exes are in the ghc package + rm -r "$pkgdir"/usr/lib/ghc-$pkgver/ghc-$pkgver + (cd "$pkgdir"/usr/lib/ghc-$pkgver/bin; rm !(ghc-pkg*)) + (cd "$pkgdir"/usr/bin; rm !(ghc-pkg*)) + + # docs moved to ghc-static + rm -r "$pkgdir"/usr/share/{man,doc} + + install -Dm644 "$srcdir"/ghc-register.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-register.hook + install -Dm644 "$srcdir"/ghc-unregister.hook "$pkgdir"/usr/share/libalpm/hooks/ghc-unregister.hook + + install -dm755 "$pkgdir"/usr/share/haskell/{register,unregister} + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} Deleted: a02fbadaf59521b5f1af3f05b45933b245093531.patch =================================================================== --- a02fbadaf59521b5f1af3f05b45933b245093531.patch 2021-09-21 22:48:48 UTC (rev 1021186) +++ a02fbadaf59521b5f1af3f05b45933b245093531.patch 2021-09-21 22:49:23 UTC (rev 1021187) @@ -1,132 +0,0 @@ -From a02fbadaf59521b5f1af3f05b45933b245093531 Mon Sep 17 00:00:00 2001 -From: Matthew Pickering <matthewtpicker...@gmail.com> -Date: Fri, 11 Jun 2021 10:48:25 +0100 -Subject: [PATCH] Optimiser: Correctly deal with strings starting with unicode - characters in exprConApp_maybe - -For example: - -"\0" is encoded to "C0 80", then the rule would correct use a decoding -function to work out the first character was "C0 80" but then just used -BS.tail so the rest of the string was "80". This resulted in - -"\0" being transformed into '\C0\80' : unpackCStringUTF8# "80" - -Which is obviously bogus. - -I rewrote the function to call utf8UnconsByteString directly and avoid -the roundtrip through Faststring so now the head/tail is computed by the -same call. - -Fixes #19976 - -(cherry picked from commit 7f6454fb8cd92b2b2ad4e88fa6d81e34d43edb9a) ---- - compiler/GHC/Core/SimpleOpt.hs | 38 +++++++++---------- - compiler/GHC/Utils/Encoding.hs | 9 +++++ - .../tests/simplCore/should_compile/T9400.hs | 4 ++ - 3 files changed, 30 insertions(+), 21 deletions(-) - -diff --git a/compiler/GHC/Core/SimpleOpt.hs b/compiler/GHC/Core/SimpleOpt.hs -index 5f1ed2ba528..9fca9d0b4b8 100644 ---- a/compiler/GHC/Core/SimpleOpt.hs -+++ b/compiler/GHC/Core/SimpleOpt.hs -@@ -52,13 +52,13 @@ import GHC.Builtin.Types - import GHC.Builtin.Names - import GHC.Types.Basic - import GHC.Unit.Module ( Module ) -+import GHC.Utils.Encoding - import GHC.Utils.Error - import GHC.Driver.Session - import GHC.Utils.Outputable - import GHC.Data.Pair - import GHC.Utils.Misc - import GHC.Data.Maybe ( orElse ) --import GHC.Data.FastString - import Data.List - import qualified Data.ByteString as BS - -@@ -841,9 +841,8 @@ calls to unpackCString# and returns: - - Just (':', [Char], ['a', unpackCString# "bc"]). - --We need to be careful about UTF8 strings here. ""# contains a ByteString, so --we must parse it back into a FastString to split off the first character. --That way we can treat unpackCString# and unpackCStringUtf8# in the same way. -+We need to be careful about UTF8 strings here. ""# contains an encoded ByteString, so -+we call utf8UnconsByteString to correctly deal with the encoding and splitting. - - We must also be careful about - lvl = "foo"# -@@ -852,6 +851,8 @@ to ensure that we see through the let-binding for 'lvl'. Hence the - (exprIsLiteral_maybe .. arg) in the guard before the call to - dealWithStringLiteral. - -+The tests for this function are in T9400. -+ - Note [Push coercions in exprIsConApp_maybe] - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - In #13025 I found a case where we had -@@ -1204,23 +1205,18 @@ dealWithStringLiteral :: Var -> BS.ByteString -> Coercion - -- This is not possible with user-supplied empty literals, GHC.Core.Make.mkStringExprFS - -- turns those into [] automatically, but just in case something else in GHC - -- generates a string literal directly. --dealWithStringLiteral _ str co -- | BS.null str -- = pushCoDataCon nilDataCon [Type charTy] co -- --dealWithStringLiteral fun str co -- = let strFS = mkFastStringByteString str -- -- char = mkConApp charDataCon [mkCharLit (headFS strFS)] -- charTail = BS.tail (bytesFS strFS) -- -- -- In singleton strings, just add [] instead of unpackCstring# ""#. -- rest = if BS.null charTail -- then mkConApp nilDataCon [Type charTy] -- else App (Var fun) -- (Lit (LitString charTail)) -- -- in pushCoDataCon consDataCon [Type charTy, char, rest] co -+dealWithStringLiteral fun str co = -+ case utf8UnconsByteString str of -+ Nothing -> pushCoDataCon nilDataCon [Type charTy] co -+ Just (char, charTail) -> -+ let char_expr = mkConApp charDataCon [mkCharLit char] -+ -- In singleton strings, just add [] instead of unpackCstring# ""#. -+ rest = if BS.null charTail -+ then mkConApp nilDataCon [Type charTy] -+ else App (Var fun) -+ (Lit (LitString charTail)) -+ -+ in pushCoDataCon consDataCon [Type charTy, char_expr, rest] co - - {- - Note [Unfolding DFuns] -diff --git a/compiler/GHC/Utils/Encoding.hs b/compiler/GHC/Utils/Encoding.hs -index 24637a3bffa..273706befe5 100644 ---- a/compiler/GHC/Utils/Encoding.hs -+++ b/compiler/GHC/Utils/Encoding.hs -@@ -18,6 +18,7 @@ module GHC.Utils.Encoding ( - utf8CharStart, - utf8DecodeChar, - utf8DecodeByteString, -+ utf8UnconsByteString, - utf8DecodeShortByteString, - utf8DecodeStringLazy, - utf8EncodeChar, -@@ -154,6 +155,14 @@ utf8DecodeByteString :: ByteString -> [Char] - utf8DecodeByteString (BS.PS fptr offset len) - = utf8DecodeStringLazy fptr offset len - -+utf8UnconsByteString :: ByteString -> Maybe (Char, ByteString) -+utf8UnconsByteString (BS.PS _ _ 0) = Nothing -+utf8UnconsByteString (BS.PS fptr offset len) -+ = unsafeDupablePerformIO $ -+ withForeignPtr fptr $ \ptr -> do -+ let (c,n) = utf8DecodeChar (ptr `plusPtr` offset) -+ return $ Just (c, BS.PS fptr (offset + n) (len - n)) -+ - utf8DecodeStringLazy :: ForeignPtr Word8 -> Int -> Int -> [Char] - utf8DecodeStringLazy fp offset (I# len#) - = unsafeDupablePerformIO $ do Copied: ghc/repos/community-testing-x86_64/a02fbadaf59521b5f1af3f05b45933b245093531.patch (from rev 1021186, ghc/trunk/a02fbadaf59521b5f1af3f05b45933b245093531.patch) =================================================================== --- a02fbadaf59521b5f1af3f05b45933b245093531.patch (rev 0) +++ a02fbadaf59521b5f1af3f05b45933b245093531.patch 2021-09-21 22:49:23 UTC (rev 1021187) @@ -0,0 +1,132 @@ +From a02fbadaf59521b5f1af3f05b45933b245093531 Mon Sep 17 00:00:00 2001 +From: Matthew Pickering <matthewtpicker...@gmail.com> +Date: Fri, 11 Jun 2021 10:48:25 +0100 +Subject: [PATCH] Optimiser: Correctly deal with strings starting with unicode + characters in exprConApp_maybe + +For example: + +"\0" is encoded to "C0 80", then the rule would correct use a decoding +function to work out the first character was "C0 80" but then just used +BS.tail so the rest of the string was "80". This resulted in + +"\0" being transformed into '\C0\80' : unpackCStringUTF8# "80" + +Which is obviously bogus. + +I rewrote the function to call utf8UnconsByteString directly and avoid +the roundtrip through Faststring so now the head/tail is computed by the +same call. + +Fixes #19976 + +(cherry picked from commit 7f6454fb8cd92b2b2ad4e88fa6d81e34d43edb9a) +--- + compiler/GHC/Core/SimpleOpt.hs | 38 +++++++++---------- + compiler/GHC/Utils/Encoding.hs | 9 +++++ + .../tests/simplCore/should_compile/T9400.hs | 4 ++ + 3 files changed, 30 insertions(+), 21 deletions(-) + +diff --git a/compiler/GHC/Core/SimpleOpt.hs b/compiler/GHC/Core/SimpleOpt.hs +index 5f1ed2ba528..9fca9d0b4b8 100644 +--- a/compiler/GHC/Core/SimpleOpt.hs ++++ b/compiler/GHC/Core/SimpleOpt.hs +@@ -52,13 +52,13 @@ import GHC.Builtin.Types + import GHC.Builtin.Names + import GHC.Types.Basic + import GHC.Unit.Module ( Module ) ++import GHC.Utils.Encoding + import GHC.Utils.Error + import GHC.Driver.Session + import GHC.Utils.Outputable + import GHC.Data.Pair + import GHC.Utils.Misc + import GHC.Data.Maybe ( orElse ) +-import GHC.Data.FastString + import Data.List + import qualified Data.ByteString as BS + +@@ -841,9 +841,8 @@ calls to unpackCString# and returns: + + Just (':', [Char], ['a', unpackCString# "bc"]). + +-We need to be careful about UTF8 strings here. ""# contains a ByteString, so +-we must parse it back into a FastString to split off the first character. +-That way we can treat unpackCString# and unpackCStringUtf8# in the same way. ++We need to be careful about UTF8 strings here. ""# contains an encoded ByteString, so ++we call utf8UnconsByteString to correctly deal with the encoding and splitting. + + We must also be careful about + lvl = "foo"# +@@ -852,6 +851,8 @@ to ensure that we see through the let-binding for 'lvl'. Hence the + (exprIsLiteral_maybe .. arg) in the guard before the call to + dealWithStringLiteral. + ++The tests for this function are in T9400. ++ + Note [Push coercions in exprIsConApp_maybe] + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + In #13025 I found a case where we had +@@ -1204,23 +1205,18 @@ dealWithStringLiteral :: Var -> BS.ByteString -> Coercion + -- This is not possible with user-supplied empty literals, GHC.Core.Make.mkStringExprFS + -- turns those into [] automatically, but just in case something else in GHC + -- generates a string literal directly. +-dealWithStringLiteral _ str co +- | BS.null str +- = pushCoDataCon nilDataCon [Type charTy] co +- +-dealWithStringLiteral fun str co +- = let strFS = mkFastStringByteString str +- +- char = mkConApp charDataCon [mkCharLit (headFS strFS)] +- charTail = BS.tail (bytesFS strFS) +- +- -- In singleton strings, just add [] instead of unpackCstring# ""#. +- rest = if BS.null charTail +- then mkConApp nilDataCon [Type charTy] +- else App (Var fun) +- (Lit (LitString charTail)) +- +- in pushCoDataCon consDataCon [Type charTy, char, rest] co ++dealWithStringLiteral fun str co = ++ case utf8UnconsByteString str of ++ Nothing -> pushCoDataCon nilDataCon [Type charTy] co ++ Just (char, charTail) -> ++ let char_expr = mkConApp charDataCon [mkCharLit char] ++ -- In singleton strings, just add [] instead of unpackCstring# ""#. ++ rest = if BS.null charTail ++ then mkConApp nilDataCon [Type charTy] ++ else App (Var fun) ++ (Lit (LitString charTail)) ++ ++ in pushCoDataCon consDataCon [Type charTy, char_expr, rest] co + + {- + Note [Unfolding DFuns] +diff --git a/compiler/GHC/Utils/Encoding.hs b/compiler/GHC/Utils/Encoding.hs +index 24637a3bffa..273706befe5 100644 +--- a/compiler/GHC/Utils/Encoding.hs ++++ b/compiler/GHC/Utils/Encoding.hs +@@ -18,6 +18,7 @@ module GHC.Utils.Encoding ( + utf8CharStart, + utf8DecodeChar, + utf8DecodeByteString, ++ utf8UnconsByteString, + utf8DecodeShortByteString, + utf8DecodeStringLazy, + utf8EncodeChar, +@@ -154,6 +155,14 @@ utf8DecodeByteString :: ByteString -> [Char] + utf8DecodeByteString (BS.PS fptr offset len) + = utf8DecodeStringLazy fptr offset len + ++utf8UnconsByteString :: ByteString -> Maybe (Char, ByteString) ++utf8UnconsByteString (BS.PS _ _ 0) = Nothing ++utf8UnconsByteString (BS.PS fptr offset len) ++ = unsafeDupablePerformIO $ ++ withForeignPtr fptr $ \ptr -> do ++ let (c,n) = utf8DecodeChar (ptr `plusPtr` offset) ++ return $ Just (c, BS.PS fptr (offset + n) (len - n)) ++ + utf8DecodeStringLazy :: ForeignPtr Word8 -> Int -> Int -> [Char] + utf8DecodeStringLazy fp offset (I# len#) + = unsafeDupablePerformIO $ do Deleted: ghc-rebuild-doc-index.hook =================================================================== --- ghc-rebuild-doc-index.hook 2021-09-21 22:48:48 UTC (rev 1021186) +++ ghc-rebuild-doc-index.hook 2021-09-21 22:49:23 UTC (rev 1021187) @@ -1,14 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/share/doc/ghc/html/libraries/* -Target = !usr/share/doc/ghc/html/libraries/index.html - -[Action] -Description = Rebuilding Haskell doc index... -When = PostTransaction -Exec = /bin/bash -c "cd /usr/share/doc/ghc/html/libraries && ./gen_contents_index" -Depends = ghc-static -Depends = bash Copied: ghc/repos/community-testing-x86_64/ghc-rebuild-doc-index.hook (from rev 1021186, ghc/trunk/ghc-rebuild-doc-index.hook) =================================================================== --- ghc-rebuild-doc-index.hook (rev 0) +++ ghc-rebuild-doc-index.hook 2021-09-21 22:49:23 UTC (rev 1021187) @@ -0,0 +1,14 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/share/doc/ghc/html/libraries/* +Target = !usr/share/doc/ghc/html/libraries/index.html + +[Action] +Description = Rebuilding Haskell doc index... +When = PostTransaction +Exec = /bin/bash -c "cd /usr/share/doc/ghc/html/libraries && ./gen_contents_index" +Depends = ghc-static +Depends = bash Deleted: ghc-register.hook =================================================================== --- ghc-register.hook 2021-09-21 22:48:48 UTC (rev 1021186) +++ ghc-register.hook 2021-09-21 22:49:23 UTC (rev 1021187) @@ -1,12 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Target = usr/share/haskell/register/*.sh - -[Action] -Description = Registering Haskell modules... -When = PostTransaction -Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" >>/var/log/haskell-register.log 2>&1 ; done' -Depends = ghc-libs -NeedsTargets Copied: ghc/repos/community-testing-x86_64/ghc-register.hook (from rev 1021186, ghc/trunk/ghc-register.hook) =================================================================== --- ghc-register.hook (rev 0) +++ ghc-register.hook 2021-09-21 22:49:23 UTC (rev 1021187) @@ -0,0 +1,12 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Target = usr/share/haskell/register/*.sh + +[Action] +Description = Registering Haskell modules... +When = PostTransaction +Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" >>/var/log/haskell-register.log 2>&1 ; done' +Depends = ghc-libs +NeedsTargets Deleted: ghc-unregister.hook =================================================================== --- ghc-unregister.hook 2021-09-21 22:48:48 UTC (rev 1021186) +++ ghc-unregister.hook 2021-09-21 22:49:23 UTC (rev 1021187) @@ -1,12 +0,0 @@ -[Trigger] -Type = Path -Operation = Upgrade -Operation = Remove -Target = usr/share/haskell/unregister/*.sh - -[Action] -Description = Unregistering Haskell modules... -When = PreTransaction -Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" >>/var/log/haskell-register.log 2>&1 ; done' -Depends = ghc-libs -NeedsTargets Copied: ghc/repos/community-testing-x86_64/ghc-unregister.hook (from rev 1021186, ghc/trunk/ghc-unregister.hook) =================================================================== --- ghc-unregister.hook (rev 0) +++ ghc-unregister.hook 2021-09-21 22:49:23 UTC (rev 1021187) @@ -0,0 +1,12 @@ +[Trigger] +Type = Path +Operation = Upgrade +Operation = Remove +Target = usr/share/haskell/unregister/*.sh + +[Action] +Description = Unregistering Haskell modules... +When = PreTransaction +Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" >>/var/log/haskell-register.log 2>&1 ; done' +Depends = ghc-libs +NeedsTargets Deleted: ghc.install =================================================================== --- ghc.install 2021-09-21 22:48:48 UTC (rev 1021186) +++ ghc.install 2021-09-21 22:49:23 UTC (rev 1021187) @@ -1,12 +0,0 @@ -pre_upgrade() { - if [[ ${1%-*} != ${2%-*} ]]; then - [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \; - fi -} - -post_upgrade() { - if [[ ${1%-*} != ${2%-*} ]]; then - echo '==> If you have custom packages installed, you will need to reinstall them now.' - echo "==> See /usr/lib/ghc-${2%-*}/package.conf.d/ for a tentative list of affected packages." - fi -} Copied: ghc/repos/community-testing-x86_64/ghc.install (from rev 1021186, ghc/trunk/ghc.install) =================================================================== --- ghc.install (rev 0) +++ ghc.install 2021-09-21 22:49:23 UTC (rev 1021187) @@ -0,0 +1,12 @@ +pre_upgrade() { + if [[ ${1%-*} != ${2%-*} ]]; then + [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \; + fi +} + +post_upgrade() { + if [[ ${1%-*} != ${2%-*} ]]; then + echo '==> If you have custom packages installed, you will need to reinstall them now.' + echo "==> See /usr/lib/ghc-${2%-*}/package.conf.d/ for a tentative list of affected packages." + fi +} Deleted: print-provides-replaces.sh =================================================================== --- print-provides-replaces.sh 2021-09-21 22:48:48 UTC (rev 1021186) +++ print-provides-replaces.sh 2021-09-21 22:49:23 UTC (rev 1021187) @@ -1,53 +0,0 @@ -#!/bin/bash - -. PKGBUILD - -if [[ ! -d src/ghc-${pkgver}/libraries ]]; then - echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/" - exit 1 -fi - -declare -A exclude -# no Win32 cause we're not building on windows -exclude['Win32']=1 -# no integer-simple because we use integer-gmp -exclude['integer-simple']=1 -# extract excluded libraries from ghc.mk -for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do - exclude[${exclude_pkg}]=1 -done - -cd src/ghc-${pkgver} - -# $1 is the name of the field -# $2 is the string for the test, either '=' or '<' -# ..$@ are the files to search -print_var() { - field=$1 - output_version=$2 - shift - shift - - printf " $field=(" - for path in $(ls $@); do - dirname=$(echo $path | awk -F '/' '{ print $2 }') - cabalfile=$(echo $path | awk -F '/' '{ print $3 }') - cabalname=$(basename $cabalfile .cabal) - [[ ${exclude[${dirname}]} ]] && continue - version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $path) - printf "'haskell-${cabalname,,}" - [[ -n "$output_version" ]] && printf "$output_version$version" - printf "'\n " - done - printf "\033[1A'haskell-${cabalname,,}" - [[ -n "$output_version" ]] && printf "$output_version$version" - printf "')\n" -} - -# For ghc-libs -print_var 'provides' '=' libraries/*/*.cabal libraries/{containers/containers,Cabal/Cabal}/*.cabal utils/ghc-pkg/*.cabal -print_var 'replaces' '' libraries/*/*.cabal libraries/{containers/containers,Cabal/Cabal}/*.cabal utils/ghc-pkg/*.cabal - -# For ghc -print_var 'provides' '=' utils/{hpc,hsc2hs,haddock*,hp2ps}/*.cabal -print_var 'replaces' '' utils/{hpc,hsc2hs,haddock*,hp2ps}/*.cabal Copied: ghc/repos/community-testing-x86_64/print-provides-replaces.sh (from rev 1021186, ghc/trunk/print-provides-replaces.sh) =================================================================== --- print-provides-replaces.sh (rev 0) +++ print-provides-replaces.sh 2021-09-21 22:49:23 UTC (rev 1021187) @@ -0,0 +1,53 @@ +#!/bin/bash + +. PKGBUILD + +if [[ ! -d src/ghc-${pkgver}/libraries ]]; then + echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/" + exit 1 +fi + +declare -A exclude +# no Win32 cause we're not building on windows +exclude['Win32']=1 +# no integer-simple because we use integer-gmp +exclude['integer-simple']=1 +# extract excluded libraries from ghc.mk +for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do + exclude[${exclude_pkg}]=1 +done + +cd src/ghc-${pkgver} + +# $1 is the name of the field +# $2 is the string for the test, either '=' or '<' +# ..$@ are the files to search +print_var() { + field=$1 + output_version=$2 + shift + shift + + printf " $field=(" + for path in $(ls $@); do + dirname=$(echo $path | awk -F '/' '{ print $2 }') + cabalfile=$(echo $path | awk -F '/' '{ print $3 }') + cabalname=$(basename $cabalfile .cabal) + [[ ${exclude[${dirname}]} ]] && continue + version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $path) + printf "'haskell-${cabalname,,}" + [[ -n "$output_version" ]] && printf "$output_version$version" + printf "'\n " + done + printf "\033[1A'haskell-${cabalname,,}" + [[ -n "$output_version" ]] && printf "$output_version$version" + printf "')\n" +} + +# For ghc-libs +print_var 'provides' '=' libraries/*/*.cabal libraries/{containers/containers,Cabal/Cabal}/*.cabal utils/ghc-pkg/*.cabal +print_var 'replaces' '' libraries/*/*.cabal libraries/{containers/containers,Cabal/Cabal}/*.cabal utils/ghc-pkg/*.cabal + +# For ghc +print_var 'provides' '=' utils/{hpc,hsc2hs,haddock*,hp2ps}/*.cabal +print_var 'replaces' '' utils/{hpc,hsc2hs,haddock*,hp2ps}/*.cabal