missing throw statements on ffi callback#4661
Closed
kares wants to merge 2 commits intojruby:masterfrom
Closed
Conversation
Member
|
Reproduced locally. I suspect there's some logic for unwrapping the Mapped type that did not get into our FFI. |
Member
|
This fixes it for me. Similar code seems to be in other type-wrangling logic. diff --git a/core/src/main/java/org/jruby/ext/ffi/CallbackInfo.java b/core/src/main/java/org/jruby/ext/ffi/CallbackInfo.java
index 34d68a3cf4..79799dd89d 100644
--- a/core/src/main/java/org/jruby/ext/ffi/CallbackInfo.java
+++ b/core/src/main/java/org/jruby/ext/ffi/CallbackInfo.java
@@ -110,6 +110,10 @@ public class CallbackInfo extends Type {
+ returnType.getMetaClass().getName() + " (expected FFI::Type)");
}
+ if (returnType instanceof MappedType) {
+ returnType = ((MappedType) returnType).getRealType();
+ }
+
if (!(paramTypes instanceof RubyArray)) {
throw context.runtime.newTypeError("wrong argument type "
+ paramTypes.getMetaClass().getName() + " (expected Array)"); |
kares
pushed a commit
that referenced
this pull request
Jun 10, 2017
kares
changed the title
Member
Author
|
now on master (6d924dc), thanks |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
not sure about this one spec:ffi fails when the error is actually thrown
someone more familiar with the piece should look at it ...
HEREs the failed job: https://travis-ci.org/kares/jruby/jobs/241153466