-(setf (gdefinition 'set-slot-value-normal) #'set-slot-value)
-
-(define-compiler-macro set-slot-value (object-form slot-name-form new-value-form)
- (if (and (constantp slot-name-form)
- (let ((slot-name (eval slot-name-form)))
- (and (symbolp slot-name) (symbol-package slot-name))))
- `(accessor-set-slot-value ,object-form ,slot-name-form ,new-value-form)
- `(set-slot-value-normal ,object-form ,slot-name-form ,new-value-form)))
-
-(defconstant *optimize-slot-boundp* nil)
+(define-compiler-macro set-slot-value (&whole form object slot-name new-value)
+ (if (and (constantp slot-name)
+ (interned-symbol-p (eval slot-name)))
+ `(accessor-set-slot-value ,object ,slot-name ,new-value)
+ form))