[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 8 commits: powerpc32: fix 64-bit comparison (#16465)

Mon May 20 01:53:14 UTC 2019

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
90ffea8e by Sergei Trofimovich at 2019-05-19T08:14:31Z
powerpc32: fix 64-bit comparison (#16465)

On powerpc32 64-bit comparison code generated dangling
target labels. This caused ghc build failure as:

    $ ./configure --target=powerpc-unknown-linux-gnu && make
    ...
    SCCs aren't in reverse dependent order
    bad blockId n3U

This happened because condIntCode' in PPC codegen generated
label name but did not place the label into `cmp_lo` code block.

The change adds the `cmp_lo` label into the case of negative
comparison.

Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>

- - - - -
bbbe15cd by Sergei Trofimovich at 2019-05-19T08:14:31Z
powerpc32: fix stack allocation code generation

When ghc was built for powerpc32 built failed as:

It's a fallout of commit 3f46cffcc2850e68405a1
("PPC NCG: Refactor stack allocation code") where
word size used to be
    II32/II64
and changed to
    II8/panic "no width for given number of bytes"
    widthFromBytes ((platformWordSize platform) `quot` 8)

The change restores initial behaviour by removing extra division.

Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>

- - - - -
527558a8 by Takenobu Tani at 2019-05-20T01:53:08Z
users-guide: Fix directive errors on 8.10

The following sections are not displayed due to a directive error:

  * -Wunused-record-wildcards
  * -Wredundant-record-wildcards

I changed the location of the `since` directive.

[skip ci]

- - - - -
56361fad by Kirill Elagin at 2019-05-20T01:53:09Z
users-guide: Fix -rtsopts default
- - - - -
a7964df8 by Javran Cheng at 2019-05-20T01:53:10Z
Fix doc for Data.Function.fix.

Doc-only change.

- - - - -
5c21fef8 by Shayne Fletcher at 2019-05-20T01:53:11Z
Update resolver for for happy 1.19.10

- - - - -
2105b65e by Ben Gamari at 2019-05-20T01:53:11Z
gitlab-ci: Allow Windows Hadrian build to fail

Due to #16574.
- - - - -
41a37c10 by Ben Gamari at 2019-05-20T01:53:11Z
Update .gitlab-ci.yml
- - - - -


7 changed files:

- .gitlab-ci.yml
- compiler/nativeGen/PPC/CodeGen.hs
- compiler/nativeGen/PPC/Instr.hs
- docs/users_guide/phases.rst
- docs/users_guide/using-warnings.rst
- hadrian/stack.yaml
- libraries/base/Data/Function.hs


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -560,6 +560,8 @@ validate-x86_64-linux-fedora27:
   stage: full-build
   variables:
     GHC_VERSION: "8.6.2"
+  # due to #16574 this currently fails
+  allow_failure: true
   script:
     - |
       python boot


=====================================
compiler/nativeGen/PPC/CodeGen.hs
=====================================
@@ -949,6 +949,7 @@ condIntCode' True cond W64 x y
                  , BCC LE cmp_lo Nothing
                  , CMPL II32 x_lo (RIReg y_lo)
                  , BCC ALWAYS end_lbl Nothing
+                 , NEWBLOCK cmp_lo
                  , CMPL II32 y_lo (RIReg x_lo)
                  , BCC ALWAYS end_lbl Nothing
 


=====================================
compiler/nativeGen/PPC/Instr.hs
=====================================
@@ -98,7 +98,7 @@ ppc_mkStackAllocInstr' platform amount
     , STU fmt r0 (AddrRegReg sp tmp)
     ]
   where
-    fmt = intFormat $ widthFromBytes ((platformWordSize platform) `quot` 8)
+    fmt = intFormat $ widthFromBytes (platformWordSize platform)
     zero = ImmInt 0
     tmp = tmpReg platform
     immAmount = ImmInt amount


=====================================
docs/users_guide/phases.rst
=====================================
@@ -937,7 +937,7 @@ for example).
     :type: dynamic
     :category: linking
 
-    :default: all
+    :default: some
 
     This option affects the processing of RTS control options given
     either on the command line or via the :envvar:`GHCRTS` environment


=====================================
docs/users_guide/using-warnings.rst
=====================================
@@ -1545,10 +1545,11 @@ of ``-W(no-)*``.
     :shortdesc: Warn about record wildcard matches when none of the bound variables
       are used.
     :type: dynamic
-    :since: 8.10.1
     :reverse: -Wno-unused-record-wildcards
     :category:
 
+    :since: 8.10.1
+
     .. index::
        single: unused, warning, record wildcards
 
@@ -1566,10 +1567,11 @@ of ``-W(no-)*``.
 .. ghc-flag:: -Wredundant-record-wildcards
     :shortdesc: Warn about record wildcard matches when the wildcard binds no patterns.
     :type: dynamic
-    :since: 8.10.1
     :reverse: -Wno-redundant-record-wildcards
     :category:
 
+    :since: 8.10.1
+
     .. index::
        single: unused, warning, record wildcards
 


=====================================
hadrian/stack.yaml
=====================================
@@ -1,7 +1,7 @@
 # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-13.14
+resolver: lts-13.21
 
 # Local packages, usually specified by relative directory name
 packages:


=====================================
libraries/base/Data/Function.hs
=====================================
@@ -45,7 +45,7 @@ infixl 1 &
 -- 120
 --
 -- Instead of making a recursive call, we introduce a dummy parameter @rec@;

--- when used within 'fix', this parameter then refers to 'fix' argument, hence
+-- when used within 'fix', this parameter then refers to 'fix'’s argument, hence
 -- the recursion is reintroduced.
 fix :: (a -> a) -> a
 fix f = let x = f x in x



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/c79afdb7fbdfe0fe4584b70b08c846bfc83ad9ad...41a37c10a42049db84e31a3b81ca506e34fdf1f3

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/c79afdb7fbdfe0fe4584b70b08c846bfc83ad9ad...41a37c10a42049db84e31a3b81ca506e34fdf1f3
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/20190519/5e8a8d1b/attachment-0001.html>
