[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 5 commits: chore: extend `.editorconfig` for C files
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Wed Oct 5 16:09:40 UTC 2022
Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
48ab9ca5 by Nicolas Trangez at 2022-10-04T20:34:10-04:00
chore: extend `.editorconfig` for C files
- - - - -
b8df5c72 by Brandon Chinn at 2022-10-04T20:34:46-04:00
Fix docs for pattern synonyms
- - - - -
463ffe02 by Oleg Grenrus at 2022-10-04T20:35:24-04:00
Use sameByteArray# in sameByteArray
- - - - -
fbe1e86e by Pierre Le Marre at 2022-10-05T15:58:43+02:00
Minor fixes following Unicode 15.0.0 update
- Fix changelog for Unicode 15.0.0
- Fix the checksums of the downloaded Unicode files, in base's tool: "ucd2haskell".
- - - - -
bf80c106 by Cheng Shao at 2022-10-05T12:09:23-04:00
rts: don't enforce aligned((8)) on 32-bit targets
We simply need to align to the word size for pointer tagging to work. On
32-bit targets, aligned((8)) is wasteful.
- - - - -
7 changed files:
- .editorconfig
- docs/users_guide/9.6.1-notes.rst
- docs/users_guide/exts/pattern_synonyms.rst
- libraries/base/Data/Array/Byte.hs
- libraries/base/changelog.md
- libraries/base/tools/ucd2haskell/ucd.sh
- rts/include/Stg.h
Changes:
=====================================
.editorconfig
=====================================
@@ -12,3 +12,7 @@ end_of_line = lf
[Makefile]
indent_style = tab
+
+[*.c]
+indent_style = space
+indent_size = 2
=====================================
docs/users_guide/9.6.1-notes.rst
=====================================
@@ -129,6 +129,8 @@ Runtime system
``(<=)`` instead of ``compare`` per CLC proposal:
https://github.com/haskell/core-libraries-committee/issues/24
+- Updated to `Unicode 15.0.0 <https://www.unicode.org/versions/Unicode15.0.0/>`_.
+
``ghc-prim`` library
~~~~~~~~~~~~~~~~~~~~
=====================================
docs/users_guide/exts/pattern_synonyms.rst
=====================================
@@ -524,9 +524,9 @@ Pragmas for pattern synonyms
----------------------------
The :ref:`inlinable-pragma`, :ref:`inline-pragma` and :ref:`noinline-pragma` are supported for pattern
-synonyms. For example: ::
+synonyms as of GHC 9.2. For example: ::
- patternInlinablePattern x = [x]
+ pattern InlinablePattern x = [x]
{-# INLINABLE InlinablePattern #-}
pattern InlinedPattern x = [x]
{-# INLINE InlinedPattern #-}
=====================================
libraries/base/Data/Array/Byte.hs
=====================================
@@ -185,8 +185,7 @@ compareByteArraysFromBeginning (ByteArray ba1#) (ByteArray ba2#) (I# n#)
-- | Do two byte arrays share the same pointer?
sameByteArray :: ByteArray# -> ByteArray# -> Bool
sameByteArray ba1 ba2 =
- case reallyUnsafePtrEquality# (unsafeCoerce# ba1 :: ()) (unsafeCoerce# ba2 :: ()) of
- r -> isTrue# r
+ case sameByteArray# ba1 ba2 of r -> isTrue# r
-- | @since 4.17.0.0
instance Eq ByteArray where
=====================================
libraries/base/changelog.md
=====================================
@@ -29,7 +29,7 @@
is now exported from `Prelude`. See [CLC #50](https://github.com/haskell/core-libraries-committee/issues/50)
for the related discussion,
as well as [the migration guide](https://github.com/haskell/core-libraries-committee/blob/main/guides/export-lifta2-prelude.md)
- * Update to Unicode 15.0.0.
+ * Update to [Unicode 15.0.0](https://www.unicode.org/versions/Unicode15.0.0/).
* Add `Eq` and `Ord` instances for `Generically1`.
* Relax instances for Functor combinators; put superclass on Class1 and Class2
to make non-breaking. See [CLC
=====================================
libraries/base/tools/ucd2haskell/ucd.sh
=====================================
@@ -12,11 +12,7 @@ VERIFY_CHECKSUM=y
# Filename:checksum
FILES="\
- ucd/DerivedCoreProperties.txt:e3eddd7d469cd1b0feed7528defad1a1cc7c6a9ceb0ae4446a6d10921ed2e7bc \
- ucd/DerivedNormalizationProps.txt:b2c444c20730b097787fdf50bd7d6dd3fc5256ab8084f5b35b11c8776eca674c \
- ucd/UnicodeData.txt:36018e68657fdcb3485f636630ffe8c8532e01c977703d2803f5b89d6c5feafb \
- ucd/PropList.txt:6bddfdb850417a5bee6deff19290fd1b138589909afb50f5a049f343bf2c6722 \
- ucd/extracted/DerivedCombiningClass.txt:12b0c3af9b600b49488d66545a3e7844ea980809627201bf9afeebe1c9f16f4e"
+ ucd/UnicodeData.txt:806e9aed65037197f1ec85e12be6e8cd870fc5608b4de0fffd990f689f376a73"
# Download the files
@@ -39,10 +35,10 @@ download_file() {
if test "$__checksum" != "$new_checksum"
then
echo "sha256sum of the downloaded __file $__file "
- echo " [$new_checksum] does not match the expected __checksum [$__checksum]"
+ echo " [$new_checksum] does not match the expected checksum [$__checksum]"
exit 1
else
- echo "$__file __checksum ok"
+ echo "$__file checksum ok"
fi
fi
}
=====================================
rts/include/Stg.h
=====================================
@@ -263,8 +263,8 @@ typedef StgFunPtr F_;
#define EB_(X) extern const char X[]
#define IB_(X) static const char X[]
/* static (non-heap) closures (requires alignment for pointer tagging): */
-#define EC_(X) extern StgWordArray (X) GNU_ATTRIBUTE(aligned (8))
-#define IC_(X) static StgWordArray (X) GNU_ATTRIBUTE(aligned (8))
+#define EC_(X) extern StgWordArray (X) GNU_ATTRIBUTE(aligned (SIZEOF_VOID_P))
+#define IC_(X) static StgWordArray (X) GNU_ATTRIBUTE(aligned (SIZEOF_VOID_P))
/* writable data (does not require alignment): */
#define ERW_(X) extern StgWordArray (X)
#define IRW_(X) static StgWordArray (X)
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/098f3df749200dd96f8c7be098ff9a839633a2bf...bf80c1065da8e3cc578557de5816ae22767f2f80
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/098f3df749200dd96f8c7be098ff9a839633a2bf...bf80c1065da8e3cc578557de5816ae22767f2f80
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221005/6fad938c/attachment-0001.html>
More information about the ghc-commits
mailing list