Fix crash due to changed HashMap internals on API 25

Fixes #2271
square · Jan 6, 2022 · 8abde14 · 8abde14
1 parent 9f15c75
commit 8abde14
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/shark/src/main/java/shark/internal/OpenJdkInstanceRefReaders.kt b/shark/src/main/java/shark/internal/OpenJdkInstanceRefReaders.kt
@@ -98,6 +98,8 @@ internal enum class OpenJdkInstanceRefReaders : OptionalFactory {
       // Initially Entry, changed to Node in JDK 1.8
       val nodeClassName = if (graph.findClassByName("java.util.HashMap\$Entry") != null) {
         "java.util.HashMap\$Entry"
+      } else if (graph.findClassByName("java.util.HashMap\$HashMapEntry") != null) {
+        "java.util.HashMap\$HashMapEntry"
       } else {
         "java.util.HashMap\$Node"
       }
@@ -172,6 +174,8 @@ internal enum class OpenJdkInstanceRefReaders : OptionalFactory {
       // Initially Entry, changed to Node in JDK 1.8
       val nodeClassName = if (graph.findClassByName("java.util.HashMap\$Entry") != null) {
         "java.util.HashMap\$Entry"
+      } else if (graph.findClassByName("java.util.HashMap\$HashMapEntry") != null) {
+        "java.util.HashMap\$HashMapEntry"
       } else {
         "java.util.HashMap\$Node"
       }

diff --git a/shark/src/test/java/shark/internal/AndroidReferenceReadersHprofTest.kt b/shark/src/test/java/shark/internal/AndroidReferenceReadersHprofTest.kt
@@ -19,6 +19,17 @@ class AndroidReferenceReadersHprofTest {
     assertThat(mapReference.referenceName).isEqualTo("key()")
     assertThat(mapReference.referenceType).isEqualTo(ARRAY_ENTRY)
   }
+
+  @Test fun `API 25 HashMap$HashMapEntry supported`() {
+    val hprofFile = "hashmap_api_25.hprof".classpathFile()
+    val analysis = hprofFile.checkForLeaks<HeapAnalysisSuccess>()
+    val leakTrace = analysis.applicationLeaks.single().leakTraces.single()
+
+    val mapReference =
+      leakTrace.referencePath.single { it.owningClassSimpleName == "HashMap" }
+    assertThat(mapReference.referenceName).isEqualTo("leaking")
+    assertThat(mapReference.referenceType).isEqualTo(ARRAY_ENTRY)
+  }
 }
 
 fun String.classpathFile(): File {

diff --git a/shark/src/test/resources/hashmap_api_25.hprof b/shark/src/test/resources/hashmap_api_25.hprof