tree faf8e7d9d87410f69dca8c40b2c0ca5558ca2ca2
parent a6df011a099f2c56bc6ae66975a0d019b94bc3b6
author Mathias Rav <mathiasr@google.com> 1527756107 +0200
committer Mathias Rav <mathiasr@google.com> 1527756107 +0200

Fix crash in DexCallSite.collectIndexedItems()

Set DexCallSite.method and instructionOffset before calling indexedItems
.addCallSite() to avoid AssertionError/NullPointerException inside
DexCallSite.compareTo().

Since DexCallSite implements Comparable, a HashMap containing
DexCallSites is allowed to use compareTo() when placing multiple
elements in the same hash bucket. Since indexedItems.addCallSite() adds
the DexCallSite to a HashMap, compareTo() must not throw an exception
when addCallSite() is called.

Fixes I4b9e8f36b 33c5b35e3 ("Make output deterministic for dex code with
invoke-custom.", 2018-05-14).

Bug: 78569026
Change-Id: I954fcfa8667586792f6201067ea312c1fa9543a0