Revert "Prevent name clashes between CL structures and builtin types"

This reverts commit 151496a4b96430924bc148f85b9c8471d1e132b1.
That commit breaks bootstrap builds due to a cyclic dependency.

2 files changed, 0 insertions, 12 deletions

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 05cb9b091d9..16f33282bae 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -43,7 +43,6 @@
 
 ;;; Code:
 
-(require 'cl-generic)
 (require 'cl-lib)
 (require 'macroexp)
 ;; `gv' is required here because cl-macs can be loaded before loaddefs.el.
@@ -2664,9 +2663,6 @@ non-nil value, that slot cannot be set via `setf'.
          (forms nil)
          (docstring (if (stringp (car descs)) (pop descs)))
          pred-form pred-check)
-    ;; Can't use `cl-check-type' yet.
-    (unless (cl--struct-name-p name)
-      (signal 'wrong-type-argument (list 'cl-struct-name-p name 'name)))
     (setq descs (cons '(cl-tag-slot)
                       (mapcar (function (lambda (x) (if (consp x) x (list x))))
                               descs)))
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index 33a1438f690..4e73a4a31b7 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -36,7 +36,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl-generic))
 (eval-when-compile (require 'cl-lib))
 (eval-when-compile (require 'cl-macs))  ;For cl--struct-class.
 
@@ -51,12 +50,6 @@
         (apply #'error string (append sargs args))
       (signal 'cl-assertion-failed `(,form ,@sargs)))))
 
-(defun cl--struct-name-p (name)
-  "Return t if NAME is a valid structure name for `cl-defstruct'."
-  (and name (symbolp name) (not (keywordp name))
-       (not (memq name (eval-when-compile cl--generic-all-builtin-types)))
-       t))
-
 ;; When we load this (compiled) file during pre-loading, the cl--struct-class
 ;; code below will need to access the `cl-struct' info, since it's considered
 ;; already as its parent (because `cl-struct' was defined while the file was
@@ -117,7 +110,6 @@
 ;;;###autoload
 (defun cl-struct-define (name docstring parent type named slots children-sym
                               tag print)
-  (cl-check-type name cl--struct-name)
   (unless type
     ;; Legacy defstruct, using tagged vectors.  Enable backward compatibility.
     (cl-old-struct-compat-mode 1))