fix(generator) struct validation ordering

LWJGL · Sep 25, 2024 · 9ab9fd5 · 9ab9fd5
1 parent 2254657
commit 9ab9fd5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/modules/generator/src/main/kotlin/org/lwjgl/generator/Structs.kt b/modules/generator/src/main/kotlin/org/lwjgl/generator/Structs.kt
@@ -468,7 +468,18 @@ class Struct(
         val validations = ArrayList<String>()
 
         fun MutableList<String>.addPointer(m: StructMember) = this.add("$t${t}long ${m.name} = memGetAddress($STRUCT + $className.${m.offsetField});")
-        fun MutableList<String>.addCount(m: StructMember) = this.add("$t$t${m.nativeType.javaMethodType} ${m.name} = n${m.name}($STRUCT);")
+        fun MutableList<String>.addCount(m: StructMember) {
+            val validation = "$t$t${m.nativeType.javaMethodType} ${m.name} = n${m.name}($STRUCT);"
+            if (!this.isEmpty()) {
+                for (i in 0 until this.size) {
+                    if (this[i].contains(m.name)) {
+                        this.add(i, validation)
+                        return
+                    }
+                }
+            }
+            this.add(validation)
+        }
 
         fun validate(m: StructMember, indent: String, hasPointer: Boolean = false): String {
             return if (m.nativeType.hasStructValidation) {

diff --git a/modules/lwjgl/core/src/main/java/org/lwjgl/system/Struct.java b/modules/lwjgl/core/src/main/java/org/lwjgl/system/Struct.java
@@ -147,6 +147,7 @@ public static void validate(long array, int count, int SIZEOF, StructValidation
             validation.validate(array + Integer.toUnsignedLong(i) * SIZEOF);
         }
     }
+    public static void validate(long array, long count, int SIZEOF, StructValidation validation) { validate(array, (int)count, SIZEOF, validation); }
 
     // ---------------- Struct Member Layout ----------------
 

diff --git a/modules/lwjgl/llvm/src/generated/java/org/lwjgl/llvm/LLVMOrcCSymbolDependenceGroup.java b/modules/lwjgl/llvm/src/generated/java/org/lwjgl/llvm/LLVMOrcCSymbolDependenceGroup.java
@@ -252,10 +252,10 @@ public static LLVMOrcCSymbolDependenceGroup.Buffer calloc(int capacity, MemorySt
      */
     public static void validate(long struct) {
         LLVMOrcCSymbolsList.validate(struct + LLVMOrcCSymbolDependenceGroup.SYMBOLS);
+        long NumDependencies = nNumDependencies(struct);
         long Dependencies = memGetAddress(struct + LLVMOrcCSymbolDependenceGroup.DEPENDENCIES);
         check(Dependencies);
         validate(Dependencies, NumDependencies, LLVMOrcCDependenceMapPair.SIZEOF, LLVMOrcCDependenceMapPair::validate);
-        long NumDependencies = nNumDependencies(struct);
     }
 
     // -----------------------------------