diff options
author | Maurice Lam <yukl@google.com> | 2021-07-20 18:25:41 +0000 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2021-07-21 18:04:26 +0000 |
commit | 0d5db7bcb686284b47bd393f364b3691a81cdab5 (patch) | |
tree | c544807665f60b27e0f3909304f24e8e10b24e45 /org.jacoco.core | |
parent | 9b7931b62bde684a7b4bad7045b66dc005b4307e (diff) | |
download | jacoco-0d5db7bcb686284b47bd393f364b3691a81cdab5.tar.gz |
Disable use of 'constant dynamic' bytecodeandroid-s-beta-5android-s-beta-5
See https://github.com/jacoco/jacoco/issues/1151.
Bug: 194171230
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true FooTest
Change-Id: Idd5b9f2fd3824b8ee7f5a71504bd816694416b37
Diffstat (limited to 'org.jacoco.core')
-rw-r--r-- | org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java index d5756b7f..bc957b91 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeArrayStrategyFactory.java @@ -50,10 +50,13 @@ public final class ProbeArrayStrategyFactory { if (counter.getCount() == 0) { return new NoneProbeArrayStrategy(); } - if (version >= Opcodes.V11 && counter.hasMethods()) { - return new CondyProbeArrayStrategy(className, true, classId, - accessorGenerator); - } +// BEGIN android-change + // See https://github.com/jacoco/jacoco/issues/1151 + // if (version >= Opcodes.V11 && counter.hasMethods()) { + // return new CondyProbeArrayStrategy(className, true, classId, + // accessorGenerator); + // } +// END android-change if (version >= Opcodes.V1_8 && counter.hasMethods()) { return new InterfaceFieldProbeArrayStrategy(className, classId, counter.getCount(), accessorGenerator); @@ -62,10 +65,13 @@ public final class ProbeArrayStrategyFactory { counter.getCount(), accessorGenerator); } } else { - if (version >= Opcodes.V11) { - return new CondyProbeArrayStrategy(className, false, classId, - accessorGenerator); - } +// BEGIN android-change + // See https://github.com/jacoco/jacoco/issues/1151 + // if (version >= Opcodes.V11) { + // return new CondyProbeArrayStrategy(className, false, classId, + // accessorGenerator); + // } +// END android-change return new ClassFieldProbeArrayStrategy(className, classId, InstrSupport.needsFrames(version), accessorGenerator); } |