luciano/coffi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'blak3mill3r/fix/fix-upcall-for-non-primitives' into develop

Browse source
This commit is contained in:
Joshua Suskalo 2021-10-25 09:33:31 -05:00
commit 154dfcecb3
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. This change
### Fixed ### Fixed
- Long and double arguments to upcalls failed to compile in some cases - Long and double arguments to upcalls failed to compile in some cases
- Void return types on upcalls would crash on serialization - Void return types on upcalls would crash on serialization
- Non-primitive types on upcalls was unsupported and would generate invalid bytecode with `nil` instructions
## [0.1.251] - 2021-10-14 ## [0.1.251] - 2021-10-14
### Fixed ### Fixed

2
src/clj/coffi/ffi.clj
View file

@ -490,7 +490,7 @@
(if (seq types) (if (seq types)
(let [prim (mem/primitive-type (first types))] (let [prim (mem/primitive-type (first types))]
(recur (rest types) (recur (rest types)
(conj acc [[(load-instructions prim) idx] (conj acc [[(load-instructions prim :aload) idx]
(to-object-asm (first types))]) (to-object-asm (first types))])
(cond-> (inc idx) (cond-> (inc idx)
(double-sized? prim) (double-sized? prim)