suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffi/unsafe/objc: fix expand-time check of (system-type 'vm)

Browse Source 
Don't make expansion depend on `(system-type 'vm)`, because expansions
should be VM-inpendent. For example, distribution builds use a single
expansion and finish up from there for different Racket
implementations.
This commit is contained in:
Matthew Flatt 2019-01-30 16:18:06 -07:00
parent 8b917039a2
commit 4e39054b91
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
racket/collects/ffi/unsafe/objc.rkt
View File

@ -904,12 +904,10 @@
[(eq? (syntax-e #'id) 'dealloc)
;; so that objects can be destroyed in foreign threads:
#'apply-directly]
[(eq? (system-type 'vm) 'chez-scheme)
[else
;; to cooperate with blocking callouts, we need a non-#f
;; `async-apply`
#'complain-apply-foreign-thread]
[else
#'#f])])
;; `async-apply` for CS
#'maybe-complain-apply-foreign-thread])])
(syntax/loc m
(kind #:async-apply async result-type (id arg ...) body0 body ...))))]
[else (raise-syntax-error #f
@ -919,12 +917,14 @@
(define (apply-directly f) (f))
(define (complain-apply-foreign-thread f)
;; We'd like to complain, but we' not in a context where there's a
;; valid way to complain. Try logging an error, and just maybe that
;; will get some information out.
(log-error "callback in unexpected thread")
(void))
(define maybe-complain-apply-foreign-thread
(and (eq? (system-type 'vm) 'chez-scheme)
(lambda (f)
;; We'd like to complain, but we' not in a context where there's a
;; valid way to complain. Try logging an error, and just maybe that
;; will get some information out.
(log-error "callback in unexpected thread")
(void))))
(define methods (make-hasheq))
(define (save-method! m)