* Remove redundant message for RuntimeHelper.requiresNonNull

* Address review comments
openjdk · Feb 15, 2021 · 1f3847b · 1f3847b
1 parent 8d424ba
commit 1f3847b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/ConstantBuilder.java b/src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/ConstantBuilder.java
@@ -154,8 +154,8 @@ Constant emitGetter(JavaSourceBuilder builder, String mods, Function<List<String
             return this;
         }
 
-        Constant emitGetter(JavaSourceBuilder builder, String mods, Function<List<String>, String> getterNameFunc, String msgIfNull) {
-            builder.emitGetter(mods, kind.type, getterNameFunc.apply(getterNameParts()), accessExpression(), true, msgIfNull);
+        Constant emitGetter(JavaSourceBuilder builder, String mods, Function<List<String>, String> getterNameFunc, String symbolName) {
+            builder.emitGetter(mods, kind.type, getterNameFunc.apply(getterNameParts()), accessExpression(), true, symbolName);
             return this;
         }
 
@@ -176,6 +176,10 @@ public Constant emitIfAbsent(String name, Constant.Kind kind, Supplier<Constant>
         Constant constant = namesGenerated.get(lookupName);
         if (constant == null) {
             constant = constantFactory.get();
+            if (constant.kind != kind) {
+                throw new AssertionError("Factory return wrong kind of constant; expected: "
+                        + kind + "; found: " + constant.kind);
+            }
             namesGenerated.put(lookupName, constant);
         }
         return constant;
@@ -263,15 +267,15 @@ private void emitLayoutString(MemoryLayout l) {
             }
             emitLayoutString(((SequenceLayout) l).elementLayout());
             append(")");
-        } else if (l instanceof GroupLayout) {
-            if (((GroupLayout) l).isStruct()) {
+        } else if (l instanceof GroupLayout group) {
+            if (group.isStruct()) {
                 append("MemoryLayout.ofStruct(\n");
             } else {
                 append("MemoryLayout.ofUnion(\n");
             }
             incrAlign();
             String delim = "";
-            for (MemoryLayout e : ((GroupLayout) l).memberLayouts()) {
+            for (MemoryLayout e : group.memberLayouts()) {
                 append(delim);
                 indent();
                 emitLayoutString(e);

diff --git a/src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/HeaderFileBuilder.java b/src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/HeaderFileBuilder.java
@@ -64,7 +64,7 @@ public void addVar(String javaName, String nativeName, MemoryLayout layout, Clas
         if (type.equals(MemorySegment.class)) {
             emitWithConstantClass(javaName, constantBuilder -> {
                 constantBuilder.addSegment(javaName, nativeName, layout)
-                        .emitGetter(this, MEMBER_MODS, Constant.QUALIFIED_NAME, "unresolved symbol: " + nativeName);
+                        .emitGetter(this, MEMBER_MODS, Constant.QUALIFIED_NAME, nativeName);
             });
         } else {
             emitWithConstantClass(javaName, constantBuilder -> {
@@ -73,7 +73,7 @@ public void addVar(String javaName, String nativeName, MemoryLayout layout, Clas
                 Constant vhConstant = constantBuilder.addGlobalVarHandle(javaName, nativeName, layout, type)
                         .emitGetter(this, MEMBER_MODS, Constant.QUALIFIED_NAME);
                 Constant segmentConstant = constantBuilder.addSegment(javaName, nativeName, layout)
-                        .emitGetter(this, MEMBER_MODS, Constant.QUALIFIED_NAME, "unresolved symbol: " + nativeName);
+                        .emitGetter(this, MEMBER_MODS, Constant.QUALIFIED_NAME, nativeName);
                 emitGlobalGetter(segmentConstant, vhConstant, javaName, nativeName, type);
                 emitGlobalSetter(segmentConstant, vhConstant, javaName, nativeName, type);
             });
@@ -84,7 +84,7 @@ public void addVar(String javaName, String nativeName, MemoryLayout layout, Clas
     public void addFunction(String javaName, String nativeName, MethodType mtype, FunctionDescriptor desc, boolean varargs, List<String> paramNames) {
         emitWithConstantClass(javaName, constantBuilder -> {
             Constant mhConstant = constantBuilder.addMethodHandle(javaName, nativeName, mtype, desc, varargs)
-                    .emitGetter(this, MEMBER_MODS, Constant.QUALIFIED_NAME, "unresolved symbol: " + nativeName);
+                    .emitGetter(this, MEMBER_MODS, Constant.QUALIFIED_NAME, nativeName);
             emitFunctionWrapper(mhConstant, javaName, nativeName, mtype, varargs, paramNames);
         });
     }
@@ -154,7 +154,7 @@ private void emitFunctionWrapper(Constant mhConstant, String javaName, String na
         indent();
         append("var mh$ = RuntimeHelper.requireNonNull(");
         append(mhConstant.accessExpression());
-        append(", \"unresolved symbol: ");
+        append(", \"");
         append(nativeName);
         append("\");\n");
         indent();
@@ -244,7 +244,7 @@ private void emitGlobalGetter(Constant segmentConstant, Constant vhConstant, Str
         append(vhConstant.accessExpression());
         append(".get(RuntimeHelper.requireNonNull(");
         append(segmentConstant.accessExpression());
-        append(", \"unresolved symbol: ");
+        append(", \"");
         append(nativeName);
         append("\"));\n");
         decrAlign();
@@ -262,7 +262,7 @@ private void emitGlobalSetter(Constant segmentConstant, Constant vhConstant, Str
         append(vhConstant.accessExpression());
         append(".set(RuntimeHelper.requireNonNull(");
         append(segmentConstant.accessExpression());
-        append(", \"unresolved symbol: ");
+        append(", \"");
         append(nativeName);
         append("\"), x);\n");
         decrAlign();

diff --git a/src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/JavaSourceBuilder.java b/src/jdk.incubator.jextract/share/classes/jdk/internal/jextract/impl/JavaSourceBuilder.java
@@ -229,7 +229,7 @@ protected void emitImportSection() {
         append(".*;\n");
     }
 
-    protected void emitGetter(String mods, Class<?> type, String name, String access, boolean nullCheck, String errMsg) {
+    protected void emitGetter(String mods, Class<?> type, String name, String access, boolean nullCheck, String symbolName) {
         incrAlign();
         indent();
         append(mods + " " + type.getSimpleName() + " " +name + "() {\n");
@@ -242,7 +242,7 @@ protected void emitGetter(String mods, Class<?> type, String name, String access
         append(access);
         if (nullCheck) {
             append(",\"");
-            append(errMsg);
+            append(symbolName);
             append("\")");
         }
         append(";\n");
@@ -257,6 +257,7 @@ protected void emitGetter(String mods, Class<?> type, String name, String access
     }
 
     int constant_counter = 0;
+    int constant_class_index = 0;
 
     static final int CONSTANTS_PER_CLASS = Integer.getInteger("jextract.constants.per.class", 5);
     ConstantBuilder constantBuilder;
@@ -267,7 +268,7 @@ protected void emitWithConstantClass(String javaName, Consumer<ConstantBuilder>
                 constantBuilder.classEnd();
             }
             constant_counter = 0;
-            constantBuilder = new ConstantBuilder(this, Kind.CLASS, javaName + "_constants");
+            constantBuilder = new ConstantBuilder(this, Kind.CLASS, "constants$" + constant_class_index++);
             constantBuilder.classBegin();
         }
         constantConsumer.accept(constantBuilder);

diff --git a/...r.jextract/share/classes/jdk/internal/jextract/impl/resources/RuntimeHelper.java.template b/...r.jextract/share/classes/jdk/internal/jextract/impl/resources/RuntimeHelper.java.template
@@ -26,9 +26,9 @@ final class RuntimeHelper {
     private final static ClassLoader LOADER = RuntimeHelper.class.getClassLoader();
     private final static MethodHandles.Lookup MH_LOOKUP = MethodHandles.lookup();
 
-    static <T> T requireNonNull(T obj, String msg) {
+    static <T> T requireNonNull(T obj, String symbolName) {
         if (obj == null) {
-            throw new UnsatisfiedLinkError(msg);
+            throw new UnsatisfiedLinkError("unresolved symbol: " + symbolName);
         }
         return obj;
     }