| commit | 9bbee1283f26b6db8873fed4dededa354b7a38b3 | [log] [tgz] |
|---|---|---|
| author | Tamas Kenez <tamaskenez@google.com> | Wed Apr 10 15:13:42 2019 +0200 |
| committer | Tamas Kenez <tamaskenez@google.com> | Thu Apr 11 08:57:17 2019 +0000 |
| tree | bc613793bc53617f579ceaf8fdc9433dfc5c556b | |
| parent | 144d093f3472644d08d50fbba26cf5337812376b [diff] |
InlineCandidateProcessor: fix incomplete condition. This condition meant to be the same as in isEligibleSingleTarget() later. For now this change makes no difference since we don't have otherwise eligible bridges here (they are not synthesized yet) but in the future we will. Change-Id: Ie824911d05b7170b5ea988c31516aafb9331e9f3
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java index 27ff46e..2f2754a 100644 --- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java +++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
@@ -662,7 +662,7 @@ return null; // Don't inline itself. } - if (isDesugaredLambda) { + if (isDesugaredLambda && !singleTarget.accessFlags.isBridge()) { markSizeForInlining(singleTarget); return new InliningInfo(singleTarget, eligibleClass); }