ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 04:59:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

compile: Disable cross-module inlining and related features.

Browse source 
This makes no difference on Guile <= 3.0.7.

* guix/build/compile.scm (strip-keyword-arguments): New procedure.
(optimizations-for-level): Use it to strip keywords related to
cross-module inlining.
This commit is contained in:
Ludovic Courtès 2022-01-14 15:59:37 +01:00
parent b0aab0f255
commit d87a1ba6b8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
guix/build/compile.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013-2014, 2016-2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -37,6 +37,21 @@ (define-module (guix build compile)
;;; ;;;
;;; Code: ;;; Code:
(define (strip-keyword-arguments keywords args) ;XXX: copied from (guix utils)
"Remove all of the keyword arguments listed in KEYWORDS from ARGS."
(let loop ((args args)
(result '()))
(match args
(()
(reverse result))
(((? keyword? kw) arg . rest)
(loop rest
(if (memq kw keywords)
result
(cons* arg kw result))))
((head . tail)
(loop tail (cons head result))))))
(define optimizations-for-level (define optimizations-for-level
(or (and=> (false-if-exception (or (and=> (false-if-exception
(resolve-interface '(system base optimize))) (resolve-interface '(system base optimize)))
@ -60,9 +75,18 @@ (define %lightweight-optimizations
(loop rest `(#f ,kw ,@result)))))) (loop rest `(#f ,kw ,@result))))))
(lambda (level) (lambda (level)
(if (<= level 1) ;; In the upcoming Guile 3.0.8, .go files include code of their
%lightweight-optimizations ;; inlinable exports and free variables are resolved at compile time
%default-optimizations))))) ;; (both are enabled at -O1) to permit cross-module inlining
;; (enabled at -O2). Unfortunately, this currently leads to
;; non-reproducible and more expensive builds, so we turn it off
;; here:
;; <https://wingolog.org/archives/2021/05/13/cross-module-inlining-in-guile>.
(strip-keyword-arguments '(#:inlinable-exports? #:resolve-free-vars?
#:cross-module-inlining?)
(if (<= level 1)
%lightweight-optimizations
%default-optimizations))))))
(define (supported-warning-type? type) (define (supported-warning-type? type)
"Return true if TYPE, a symbol, denotes a supported warning type." "Return true if TYPE, a symbol, denotes a supported warning type."