commit 317842f941eb751ded9acea636a23434462c9764
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 14 12:01:46 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 14 12:01:46 2020 +0100
tree 1cf1d23f129964640ca5af4874b4a60db9a91ee4
parent 969fc68cc6d539748b065cfd14493165158f9661

Fix bad merge in InlineCandidateProcessor

Change-Id: Ia26452f1ab8735f9f8ba4ae6f38277c1705d12f4

src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java

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 c8e86ee..17510c2 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
@@ -816,7 +816,7 @@
       }
       if (eligibility.hasMonitorOnReceiver) {
         // We will not be able to remove the monitor instruction afterwards.
-        return null;
+        return false;
       }
     }