Apply suggestions from code review

Co-authored-by: Mandy Chung <[email protected]>
JabRef · Jul 1, 2023 · 1bc4f79 · 1bc4f79
1 parent e62e7aa
commit 1bc4f79
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
@@ -721,7 +721,7 @@ private void genModuleDescriptorsMethod(ClassBuilder clb) {
                 currentModuleInfos.add(moduleInfos.get(index));
             }
 
-            final String helperMethodNamePrefix = "moduleDescriptorsSub";
+            String helperMethodNamePrefix = "sub";
             final ClassDesc arrayListClassDesc = ClassDesc.ofInternalName("java/util/ArrayList");
 
             final int firstVariableForDedup = nextLocalVar;
@@ -750,14 +750,15 @@ private void genModuleDescriptorsMethod(ClassBuilder clb) {
                            .areturn();
                     });
 
-            final int[] globalCount = {0};
-            for (final int[] index = {0}; index[0] < splitModuleInfos.size(); index[0]++) {
+            for (int n = 0, count = 0; n < splitModuleInfos.size(); count += splitModuleInfos.get(n).size(), n++) {
+                int index = n;          // the index of which ModuleInfo being processed in the current batch
+                int start = count;   // the start index to the return ModuleDescriptor array for the current batch
                 clb.withMethodBody(
                         helperMethodNamePrefix + index[0],
                         MethodTypeDesc.of(CD_void, CD_MODULE_DESCRIPTOR.arrayType(), arrayListClassDesc),
                         ACC_PUBLIC,
                         cob -> {
-                            List<ModuleInfo> moduleInfosPackage = splitModuleInfos.get(index[0]);
+                            List<ModuleInfo> currentBatch = splitModuleInfos.get(index[0]);
 
                             if (nextLocalVar > firstVariableForDedup) {
                                 for (int i = nextLocalVar-1; i >= firstVariableForDedup; i--) {