asotona review remarks

liachmodded · Oct 11, 2024 · b4f0ebc · b4f0ebc
1 parent 7944379
commit b4f0ebc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 939 deletions.
diff --git a/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java b/src/java.base/share/classes/java/lang/classfile/instruction/DiscontinuedInstruction.java
@@ -34,8 +34,6 @@
 import jdk.internal.classfile.impl.Util;
 import jdk.internal.javac.PreviewFeature;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * Models instruction discontinued from the {@code code} array of a {@code Code}
  * attribute. Delivered as a {@link CodeElement} when traversing the elements of

diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassRemapperImpl.java
@@ -273,6 +273,7 @@ public CodeTransform asCodeTransform() {
 
     @Override
     public ClassDesc map(ClassDesc desc) {
+        if (desc == null) return null;
         if (desc.isArray()) return map(desc.componentType()).arrayType();
         if (desc.isPrimitive()) return desc;
         return mapFunction.apply(desc);