Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	libguile/procprop.c
	libguile/smob.c
	libguile/smob.h
	libguile/vm.c
	module/language/tree-il/primitives.scm

module/language/tree-il/primitives.scm

@@ -267,11 +267,15 @@
        ((<module-ref> src mod name public?)
         ;; for the moment, we're disabling primitive resolution for
         ;; public refs because resolve-interface can raise errors.
-        (let ((m (and (not public?) (resolve-module mod))))
+        (and=> (and=> (resolve-module mod)
-          (and m 
+                      (if public?
-               (and=> (hashq-ref *interesting-primitive-vars*
+                          module-public-interface
-                                 (module-variable m name))
+                          identity))
-                      (lambda (name) (make-primitive-ref src name))))))
+               (lambda (m)
+                 (and=> (hashq-ref *interesting-primitive-vars*
+                                   (module-variable m name))
+                        (lambda (name)
+                          (make-primitive-ref src name))))))
        ((<call> src proc args)
         (and (primitive-ref? proc)
              (make-primcall src (primitive-ref-name proc) args)))

test-suite/tests/tree-il.test

@@ -1598,7 +1598,15 @@
    (lambda _
      (lambda-case
       (((x y) #f #f #f () (_ _))
-       _)))))
+       _))))
+
+  (pass-if-peval resolve-primitives
+   ((@ (guile) car) '(1 2))
+   (const 1))
+
+  (pass-if-peval resolve-primitives
+   ((@@ (guile) car) '(1 2))
+   (const 1)))