[105033] trunk/dports/lang/sbcl

easieste at macports.org easieste at macports.org
Mon Apr 8 04:57:45 PDT 2013


Revision: 105033
          https://trac.macports.org/changeset/105033
Author:   easieste at macports.org
Date:     2013-04-08 04:57:45 -0700 (Mon, 08 Apr 2013)
Log Message:
-----------
Include post-1.1.6 patch for SBCL SVREF bug.

c.f. 
     http://www.advogato.org/person/crhodes/diary/163.html
     https://github.com/sbcl/sbcl/commit/e626db9d157d8790efe3762a7f46cc347161f8e8

Modified Paths:
--------------
    trunk/dports/lang/sbcl/Portfile

Added Paths:
-----------
    trunk/dports/lang/sbcl/files/patch-svref-1.1.6.diff

Modified: trunk/dports/lang/sbcl/Portfile
===================================================================
--- trunk/dports/lang/sbcl/Portfile	2013-04-08 11:54:17 UTC (rev 105032)
+++ trunk/dports/lang/sbcl/Portfile	2013-04-08 11:57:45 UTC (rev 105033)
@@ -6,7 +6,7 @@
 name            sbcl
 
 version         1.1.6
-revision        0
+revision        1
 
 categories      lang
 license         BSD
@@ -24,17 +24,22 @@
 
 
 homepage        http://www.sbcl.org
-master_sites    sourceforge
+master_sites    sourceforge:sbcl
+
 use_bzip2       yes
 
-patchfiles      patch-use-right-gcc.diff
 
+# REMOVE patch-svref-1.1.6.diff (hopfully) with sbcl-1.1.7
+patchfiles      \
+    patch-use-right-gcc.diff \
+    patch-svref-1.1.6.diff 
+
 distname        ${name}-${version}-source
 worksrcdir      ${name}-${version}
 
-checksums           ${distname}${extract.suffix} \
-                    rmd160  28f83c0f447590d1209f0c8e6fba8dc03cc78b8e \
-                    sha256  a25b3c9429db88455cc8ef98f8a53d08e1a65f1e9df3df6b23b75412b15cb9c5 \
+checksums       sbcl-${version}-source.tar.bz2 \
+    rmd160  28f83c0f447590d1209f0c8e6fba8dc03cc78b8e \
+    sha256  a25b3c9429db88455cc8ef98f8a53d08e1a65f1e9df3df6b23b75412b15cb9c5 \
 
 platform powerpc {
     set bootversion 1.0.47

Added: trunk/dports/lang/sbcl/files/patch-svref-1.1.6.diff
===================================================================
--- trunk/dports/lang/sbcl/files/patch-svref-1.1.6.diff	                        (rev 0)
+++ trunk/dports/lang/sbcl/files/patch-svref-1.1.6.diff	2013-04-08 11:57:45 UTC (rev 105033)
@@ -0,0 +1,43 @@
+# HG changeset patch
+# User Stas Boukarev <stassats at gmail.com>
+# Date 1364824768 -14400
+# Node ID 8766d27eb4288597be84d85905ae2eb81f2f2a4a
+# Parent  6b499774d52ad410a91eb65227bec4ac9803369c
+Check bounds of ELT on &more in safe code.
+
+Disable &more optimizations for ELT if safety = 3.
+
+diff -r 6b499774d52a -r 8766d27eb428 src/compiler/srctran.lisp
+--- src/compiler/srctran.lisp	Sun Mar 31 21:27:14 2013 +0400
++++ src/compiler/srctran.lisp	Mon Apr 01 17:59:28 2013 +0400
+@@ -4152,10 +4152,12 @@
+         `(car (nthcdr ,n ,list)))))
+ 
+ (define-source-transform elt (seq n)
+-  (multiple-value-bind (context count) (possible-rest-arg-context seq)
+-    (if context
+-        `(%rest-ref ,n ,seq ,context ,count)
+-        (values nil t))))
++  (if (policy *lexenv* (= safety 3))
++      (values nil t)
++      (multiple-value-bind (context count) (possible-rest-arg-context seq)
++        (if context
++            `(%rest-ref ,n ,seq ,context ,count)
++            (values nil t)))))
+ 
+ ;;; CAxR -> %REST-REF
+ (defun source-transform-car (list nth)
+diff -r 6b499774d52a -r 8766d27eb428 tests/seq.pure.lisp
+--- tests/seq.pure.lisp	Sun Mar 31 21:27:14 2013 +0400
++++ tests/seq.pure.lisp	Mon Apr 01 17:59:28 2013 +0400
+@@ -370,3 +370,10 @@
+                                     (t #'shuffle))
+                                   size type)
+                          #'< :key #'car))))))))
++
++(with-test (:name &more-elt-index-too-large)
++  (assert (raises-error? (funcall
++                          (compile nil '(lambda (&rest args)
++                                         (declare (optimize safety))
++                                         (elt args 0))))
++                         sb-kernel:index-too-large-error)))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130408/d0034f8e/attachment.html>


More information about the macports-changes mailing list