MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

DfaAssist: fix class loader mocking; support null context loader

Browse Source 
GitOrigin-RevId: 38ef9b85c6e66306d694c4361ca4e22f276ec90e
This commit is contained in:
Tagir Valeev
2019-12-17 09:02:33 +00:00
committed by intellij-monorepo-bot
parent 11178787f7
commit f4d01ce645
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/dfaassist/DebuggerDfaRunner.java
+12 -10
View File
@@ -204,7 +204,7 @@ class DebuggerDfaRunner extends DataFlowRunner {
private class StateBuilder {
private final @NotNull PsiElementFactory myPsiFactory = JavaPsiFacade.getElementFactory(myProject);
private final @NotNull DfaValueFactory myFactory = getFactory();
private final @NotNull ClassLoaderReference myContextLoader;
private final @Nullable ClassLoaderReference myContextLoader;
private final @NotNull DfaMemoryState myMemState;
private final @NotNull Map<Value, DfaVariableValue> myCanonicalMap = new HashMap<>();
private @Nullable List<ClassLoaderReference> myParentLoaders = null;
@@ -285,15 +285,17 @@ class DebuggerDfaRunner extends DataFlowRunner {
private List<ClassLoaderReference> getParentLoaders() {
if (myParentLoaders == null) {
List<ClassLoaderReference> loaders = Collections.emptyList();
ClassType classLoaderClass = (ClassType)myContextLoader.referenceType();
while (classLoaderClass != null && !"java.lang.ClassLoader".equals(classLoaderClass.name())) {
classLoaderClass = classLoaderClass.superclass();
}
if (classLoaderClass != null) {
Field parent = classLoaderClass.fieldByName("parent");
if (parent != null) {
loaders = StreamEx.iterate(
myContextLoader, Objects::nonNull, loader -> ObjectUtils.tryCast(loader.getValue(parent), ClassLoaderReference.class)).toList();
if (myContextLoader != null) {
ClassType classLoaderClass = (ClassType)myContextLoader.referenceType();
while (classLoaderClass != null && !"java.lang.ClassLoader".equals(classLoaderClass.name())) {
classLoaderClass = classLoaderClass.superclass();
}
if (classLoaderClass != null) {
Field parent = classLoaderClass.fieldByName("parent");
if (parent != null) {
loaders = StreamEx.iterate(
myContextLoader, Objects::nonNull, loader -> ObjectUtils.tryCast(loader.getValue(parent), ClassLoaderReference.class)).toList();
}
}
}
myParentLoaders = loaders;