|
25 | 25 | */ |
26 | 26 | package jdk.internal.classfile.impl; |
27 | 27 |
|
28 | | -import java.io.BufferedInputStream; |
29 | | -import java.io.DataInputStream; |
30 | 28 | import java.io.IOException; |
31 | 29 | import java.io.InputStream; |
32 | 30 | import java.io.UncheckedIOException; |
33 | | -import java.lang.classfile.ClassFile; |
34 | 31 | import java.lang.classfile.ClassHierarchyResolver; |
35 | | -import java.lang.classfile.ClassReader; |
36 | 32 | import java.lang.classfile.constantpool.ClassEntry; |
37 | 33 | import java.lang.constant.ClassDesc; |
38 | 34 | import java.util.Collection; |
|
41 | 37 | import java.util.function.Function; |
42 | 38 |
|
43 | 39 | import static java.lang.classfile.ClassFile.ACC_INTERFACE; |
44 | | -import static java.lang.classfile.constantpool.PoolEntry.*; |
45 | 40 | import static java.lang.constant.ConstantDescs.CD_Object; |
46 | 41 | import static java.util.Objects.requireNonNull; |
47 | 42 | import static jdk.internal.constant.ConstantUtils.referenceClassDesc; |
@@ -168,7 +163,7 @@ public ClassHierarchyResolver.ClassHierarchyInfo getClassInfo(ClassDesc classDes |
168 | 163 | var ci = streamProvider.apply(classDesc); |
169 | 164 | if (ci == null) return null; |
170 | 165 | try (ci) { |
171 | | - ClassReader reader = new ClassReaderImpl(ci.readAllBytes(), (ClassFileImpl) ClassFile.of()); |
| 166 | + var reader = new ClassReaderImpl(ci.readAllBytes(), ClassFileImpl.DEFAULT_CONTEXT); |
172 | 167 | boolean isInterface = (reader.flags() & ACC_INTERFACE) != 0; |
173 | 168 | ClassDesc superClass = reader.superclassEntry() |
174 | 169 | .map(ClassEntry::asSymbol) |
|
0 commit comments