repair duplicate checking in import

mats/8.ms

@@ -7371,6 +7371,21 @@
       (import (testfile-C))
       (list $testfile-A-x (get-property $testfile-A-x $testfile-A-prop-id)))
     '((a . b) (c . d)))
+  (begin
+    (expand
+     '(begin
+        (library (beep-lib)
+          (export cons beep)
+          (import (chezscheme))
+          (define beep 'beep)
+          (define-property cons beep #t))
+        (library (boop-lib)
+          (export button)
+          (import (chezscheme)
+                  (rename (beep-lib)
+                          (beep boop)))
+          (define (button) (display boop)))))
+    #t)
 )
 
 (mat library1

release_notes/release_notes.stex

@@ -3065,6 +3065,13 @@ in fasl files does not generally make sense.
 %-----------------------------------------------------------------------------
 \section{Bug Fixes}\label{section:bugfixes}
 
+\subsection{Repair duplicate checking in \scheme{import} (10.5.0)}
+
+Repair checking of duplicate names on \scheme{import} in the case of
+an import that has a property via \scheme{define-property}. Before
+this repair, a non-conflicting import could be incorrectly rejected as
+having a conflict.
+
 \subsection{Repair \scheme{configure} on FreeBSD powerpc64 and powerpc64le (10.5.0)}
 
 On FreeBSD, \scheme{uname -m} reports \scheme{powerpc} for 32-bit and

s/syntax.ss

@@ -3326,7 +3326,7 @@
                                  (record-iface! defn-table imps))
                                (begin
                                  (for-each (lambda (id) (import-extend-ribcage! ribcage id)) imps)
-                                 (for-each (lambda (id) (record-id! defn-table id (resolved-id->label/pl id))) imps)))))))
+                                 (for-each (lambda (id) (record-id! defn-table id (resolved-id->label id))) imps)))))))
                  (parse (cdr body) mb* inits chexports #f expspec** iexport* impind? label*)]
                 [(export-form)
                  (let ([expspec* (parse-export e w ae)])