commit 0cd867639e985cabc72ace8bb79c4e9bc8bb7653
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Sep 23 12:27:27 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Sep 23 10:28:26 2020 +0000
tree ff2805d0e7c0167bd31c60ea3c1bc95b5ffbea41
parent 704ce9776e51c2a0eec9dd20d6647f58612afe3b

Rename variables and methods to be more inclusive

Change-Id: I516c18913c2c918d02592689a9cf7508af3cdc8c

src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java b/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
index 7a5dce9..0fc9b80 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/DefaultInliningOracle.java
@@ -264,8 +264,7 @@
       return null;
     }
 
-    if (inliner.isBlacklisted(
-        invoke, resolutionResult, singleTarget, whyAreYouNotInliningReporter)) {
+    if (inliner.neverInline(invoke, resolutionResult, singleTarget, whyAreYouNotInliningReporter)) {
       return null;
     }
 

src/main/java/com/android/tools/r8/ir/optimize/Inliner.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java b/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
index a36f313..ca93336 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/Inliner.java
@@ -85,7 +85,7 @@
 public class Inliner implements PostOptimization {
 
   protected final AppView<AppInfoWithLiveness> appView;
-  private final Set<DexMethod> blacklist;
+  private final Set<DexMethod> extraNeverInlineMethods;
   private final LambdaMerger lambdaMerger;
   private final LensCodeRewriter lensCodeRewriter;
   final MainDexTracingResult mainDexClasses;
@@ -106,7 +106,7 @@
       LensCodeRewriter lensCodeRewriter) {
     Kotlin.Intrinsics intrinsics = appView.dexItemFactory().kotlin.intrinsics;
     this.appView = appView;
-    this.blacklist =
+    this.extraNeverInlineMethods =
         appView.options().kotlinOptimizationOptions().disableKotlinSpecificOptimizations
             ? ImmutableSet.of()
             : ImmutableSet.of(intrinsics.throwNpe, intrinsics.throwParameterIsNullException);
@@ -119,7 +119,7 @@
             : null;
   }
 
-  boolean isBlacklisted(
+  boolean neverInline(
       InvokeMethod invoke,
       SingleResolutionResult resolutionResult,
       ProgramMethod singleTarget,
@@ -136,10 +136,11 @@
       return true;
     }
 
-    if (blacklist.contains(appView.graphLens().getOriginalMethodSignature(singleTargetReference))
+    if (extraNeverInlineMethods.contains(
+            appView.graphLens().getOriginalMethodSignature(singleTargetReference))
         || TwrCloseResourceRewriter.isSynthesizedCloseResourceMethod(
             singleTargetReference, appView)) {
-      whyAreYouNotInliningReporter.reportBlacklisted();
+      whyAreYouNotInliningReporter.reportExtraNeverInline();
       return true;
     }
 

src/main/java/com/android/tools/r8/ir/optimize/inliner/NopWhyAreYouNotInliningReporter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/inliner/NopWhyAreYouNotInliningReporter.java b/src/main/java/com/android/tools/r8/ir/optimize/inliner/NopWhyAreYouNotInliningReporter.java
index 8cbb1f4..e398dce 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/inliner/NopWhyAreYouNotInliningReporter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/inliner/NopWhyAreYouNotInliningReporter.java
@@ -22,7 +22,7 @@
   }
 
   @Override
-  public void reportBlacklisted() {}
+  public void reportExtraNeverInline() {}
 
   @Override
   public void reportCallerNotSameClass() {}

src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporter.java b/src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporter.java
index 05d9b49..b3e72bf 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporter.java
@@ -45,7 +45,7 @@
     }
   }
 
-  public abstract void reportBlacklisted();
+  public abstract void reportExtraNeverInline();
 
   public abstract void reportCallerNotSameClass();
 

src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporterImpl.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporterImpl.java b/src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporterImpl.java
index 934651c..ee2d4b5 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporterImpl.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/inliner/WhyAreYouNotInliningReporterImpl.java
@@ -48,8 +48,8 @@
   }
 
   @Override
-  public void reportBlacklisted() {
-    print("method is blacklisted from inlining.");
+  public void reportExtraNeverInline() {
+    print("method is marked as an additional never inline method.");
   }
 
   @Override