[Openmcl-cvs-notifications] r14713 - in /release/1.6/source: ./ compiler/nx-basic.lisp compiler/nx0.lisp level-0/l0-misc.lisp

[rme at clozure.com]

Author: rme
Date: Thu Apr 14 11:04:04 2011
New Revision: 14713

Log:
Merge r14703 from trunk.

See ticket:840.

Modified:
    release/1.6/source/   (props changed)
    release/1.6/source/compiler/nx-basic.lisp
    release/1.6/source/compiler/nx0.lisp
    release/1.6/source/level-0/l0-misc.lisp   (props changed)

Propchange: release/1.6/source/
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 14 11:04:04 2011
@@ -4,4 +4,4 @@
 /branches/rme-logops:13875-13886
 /branches/working-0711/ccl:7970-13192,13197-13198,13202,13208,13214,13235-=
13236,13239,13263,13277-13278,13290,13293-13294,13302-13306,13331-13332,133=
39,13361-13364,13379,13383,13386,13388,13409,13435-13436,13438,13440-13442,=
13460-13461,13465,13467,13476,13487,13490,13492-13493,13502-13528,13545-135=
47,13549,13557-13558
 /release/1.5/source:13667
-/trunk/source:14361-14404,14422-14423,14425-14432,14435,14437-14438,14440-=
14441,14444-14445,14451,14457,14460-14464,14472,14476-14479,14482-14484,144=
94-14495,14519,14550,14559,14662,14690,14692
+/trunk/source:14361-14404,14422-14423,14425-14432,14435,14437-14438,14440-=
14441,14444-14445,14451,14457,14460-14464,14472,14476-14479,14482-14484,144=
94-14495,14519,14550,14559,14662,14690,14692,14703

Modified: release/1.6/source/compiler/nx-basic.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/compiler/nx-basic.lisp (original)
+++ release/1.6/source/compiler/nx-basic.lisp Thu Apr 14 11:04:04 2011
@@ -591,6 +591,8 @@
       (when (and (eq (car decl) sym)
                  (eq (cadr decl) 'inline))
         (return-from nx-declared-inline-p (eq (cddr decl) 'inline))))
+    (when (assq sym (lexenv.functions env))
+      (return nil))
     (setq env (lexenv.parent-env env))))
 =

 (defun report-compile-time-argument-mismatch (condition stream &aux (type =
(compiler-warning-warning-type condition)))

Modified: release/1.6/source/compiler/nx0.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.6/source/compiler/nx0.lisp (original)
+++ release/1.6/source/compiler/nx0.lisp Thu Apr 14 11:04:04 2011
@@ -1921,6 +1921,8 @@
       (when (and (eq (car decl) sym)
                  (eq (cadr decl) 'inline))
          (return-from nx-declared-notinline-p (eq (cddr decl) 'notinline))=
))
+    (when (assq sym (lexenv.functions env))
+      (return nil))
     (setq env (lexenv.parent-env env))))
 =

 =


Propchange: release/1.6/source/level-0/l0-misc.lisp
---------------------------------------------------------------------------=
---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 14 11:04:04 2011
@@ -4,4 +4,4 @@
 /branches/rme-logops/level-0/l0-misc.lisp:13875-13886
 /branches/working-0711/ccl/level-0/l0-misc.lisp:7970-13192,13197-13198,132=
02,13208,13214,13235-13236,13239,13263,13277-13278,13290,13293-13294,13302-=
13306,13331-13332,13339,13361-13364,13379,13383,13386,13388,13409,13435-134=
36,13438,13440-13442,13460-13461,13465,13467,13476,13487,13490,13492-13493,=
13502-13528,13545-13547,13549,13557-13558
 /release/1.5/source/level-0/l0-misc.lisp:13667
-/trunk/source/level-0/l0-misc.lisp:14361-14404,14422-14423,14425-14432,144=
35,14437-14438,14440-14441,14444-14445,14451,14457,14460-14464,14472,14476-=
14479,14482-14484,14494-14495,14541,14550,14559,14662,14692
+/trunk/source/level-0/l0-misc.lisp:14361-14404,14422-14423,14425-14432,144=
35,14437-14438,14440-14441,14444-14445,14451,14457,14460-14464,14472,14476-=
14479,14482-14484,14494-14495,14541,14550,14559,14662,14692,14703