ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 14:52:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

base32: Work around (ash x N) miscompilation at '-O1' and below.

Browse source 
Fixes <https://issues.guix.gnu.org/50696>.
Reported by Marius Bakke <marius@gnu.org>.

* guix/base32.scm (bit-field): Introduce 'minus-start' syntax and use it.
This commit is contained in:
Ludovic Courtès 2021-09-21 09:43:53 +02:00
parent baf8272d23
commit 68933659cb
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guix/base32.scm
View file

@ -53,7 +53,15 @@ (define-syntax bit-field
(let* ((s (syntax->datum #'start)) (let* ((s (syntax->datum #'start))
(e (syntax->datum #'end)) (e (syntax->datum #'end))
(mask (- (expt 2 (- e s)) 1))) (mask (- (expt 2 (- e s)) 1)))
#`(logand (ash n (- start)) #,mask)))))) ;; The baseline compiler in Guile <= 3.0.7 miscompiles (ash x N) as
;; (ash x (- N)) when N is a literal: <https://bugs.gnu.org/50696>.
;; Here we take advantage of another bug in the baseline compiler,
;; fixed in Guile commit 330c6ea83f492672578b62d0683acbb532d1a5d9: we
;; introduce 'minus-start' such that it has a different source
;; location, which in turn means that the baseline compiler pattern
;; for (ash x N) doesn't match, thus avoiding the bug (!).
(with-syntax ((minus-start (datum->syntax #'start (- s))))
#`(logand (ash n minus-start) #,mask)))))))
(define bytevector-quintet-ref (define bytevector-quintet-ref
(let* ((ref bytevector-u8-ref) (let* ((ref bytevector-u8-ref)