[foreign-jextract] Integrated: 8260602: jextract generates redundant functional interafces

[Maurizio Cimadamore]

On Thu, 28 Jan 2021 18:56:29 GMT, Maurizio Cimadamore <mcimadamore at openjdk.org> wrote:

> There seems to be an issue in how jextract handles function pointer typedef.
> 
> Currently, these typedefs are handled in two places:
> 
> * OutputFactory::visitVar
> * OutputFactory::visitFunction
> 
> That is, if a variable (struct field or global), or a function parameter is seen to have a typedef of a function pointer, jextract will generate a functional interface _exactly at that point_ where the variable is found. This might be inside a struct.
> 
> Now, what we really want is slightly different: the functional interface for a function pointer typedef should really be generated in the toplevel interface hierarchy; any other reference to it (from struct fields, or function parameters, or globals) should _not_ result in additional functional interface declaration.
> 
> In other words, in this example [1]:
> 
>     typedef void (*callback_t)(void *arg);
> 
>     typedef struct first_handler {
>          callback_t cb;
>     } first_handler_t;
> 
>     typedef struct second_handler {
>          callback_t cb;
>     } second_handler_t;
> 
> There should be (in the user perspective) only _one_ functional interface, and its name should just be `callback_t`.
> 
> The fix is to make OutputFactory::getAsFunctionPointer non-transparent w.r.t. typedefs - that is, if a typedef is found, that method should just return null (so that the enclosing code will skip functional interface generation). To counter balance that, we need to add logic for functional interface declaration inside OutputFactory::visitTypedef.
> 
> I did not add any new test, since it turns out we already had a test for this (LibTest8258605Test) whose code was referring to the same typedef-ed function pointer using two names - this fix rectifies that behavior, and the test is now updated.
> 
> [1] - https://mail.openjdk.java.net/pipermail/panama-dev/2021-January/011948.html

This pull request has now been integrated.

Changeset: c26ad46b
Author:    Maurizio Cimadamore <mcimadamore at openjdk.org>
URL:       https://git.openjdk.java.net/panama-foreign/commit/c26ad46b
Stats:     13 lines in 3 files changed: 9 ins; 0 del; 4 mod

8260602: jextract generates redundant functional interafces

Reviewed-by: sundar

-------------

PR: https://git.openjdk.java.net/panama-foreign/pull/442