8282235: jextract crashes when a Java keyword is used in as a function pointer typedef parameter name

Reviewed-by: mcimadamore

Author: sundararajana

src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/FunctionalInterfaceBuilder.java

@@ -69,7 +69,7 @@ private String parameterName(int i) {
         if (parameterNames.isPresent()) {
             name = parameterNames.get().get(i);
         }
-        return name.isEmpty()? "_x" + i : name;
+        return name.isEmpty()? "_x" + i : Utils.javaSafeIdentifier(name);
     }
 
     private void emitFunctionalInterfaceMethod() {

test/jdk/tools/jextract/test8282235/Test8282235.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+import test.jextract.test8282235.*;
+
+/*
+ * @test id=sources
+ * @bug 8282235
+ * @summary jextract crashes when a Java keyword is used in as a function pointer typedef parameter name
+ * @library ..
+ * @modules jdk.incubator.jextract
+ * @run main/othervm JtregJextractSources -l Test8282235 -t test.jextract.test8282235 -- test8282235.h
+ * @run testng/othervm --enable-native-access=jdk.incubator.jextract,ALL-UNNAMED Test8282235
+ */
+public class Test8282235 {
+    @Test
+    public void testFunctionalInterfaceParameterNames() throws NoSuchMethodException {
+        var apply = func.class.getMethod("apply", int.class);
+        assertEquals(apply.getParameters()[0].getName(), "abstract_");
+        apply = fptr.class.getMethod("apply", int.class, int.class);
+        assertEquals(apply.getParameters()[0].getName(), "public_");
+        assertEquals(apply.getParameters()[1].getName(), "interface_");
+    }
+}

test/jdk/tools/jextract/test8282235/test8282235.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+typedef void func(int abstract);
+typedef void (*fptr)(int public, int interface);