Fallback to default frames computation

JetBrains · Dec 9, 2024 · d954eda · d954eda
1 parent 41f485d
commit d954eda
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/util/src/com/intellij/rt/coverage/instrumentation/ClassWriterImpl.java b/util/src/com/intellij/rt/coverage/instrumentation/ClassWriterImpl.java
@@ -37,6 +37,12 @@ class ClassWriterImpl extends ClassWriter {
     myClassReaders = classReaders;
   }
 
+  @Override
+  protected ClassLoader getClassLoader() {
+    if (myClassLoader != null) return myClassLoader;
+    return super.getClassLoader();
+  }
+
   protected String getCommonSuperClass(String type1, String type2) {
     try {
       ClassReader info1 = getOrLoadClassReader(type1);
@@ -69,6 +75,12 @@ protected String getCommonSuperClass(String type1, String type2) {
           return result;
         }
       }
+    } catch (FrameComputationClassNotFoundException e) {
+      try {
+        return super.getCommonSuperClass(type1, type2);
+      } catch (TypeNotPresentException ignored) {
+        throw e;
+      }
     } catch (IOException e) {
       throw new RuntimeException(e.toString());
     }
@@ -124,9 +136,12 @@ private synchronized ClassReader getOrLoadClassReader(String className) throws I
       InputStream is = null;
       try {
         String resource = className + ".class";
-        is = myClassLoader == null
-            ? ClassLoader.getSystemResourceAsStream(resource)
-            : myClassLoader.getResourceAsStream(resource);
+        if (myClassLoader != null) {
+          is = myClassLoader.getResourceAsStream(resource);
+        }
+        if (is == null) {
+          is = ClassLoader.getSystemResourceAsStream(resource);
+        }
         if (is == null) {
           throw new FrameComputationClassNotFoundException("Class " + className + " not found");
         }