More inclusive language fixes

Bug: 161896447
Bug: 161850439
Bug: 161336379
Test: art/test.py --host
Change-Id: I1519e22d40cb28f243dd75b12d455cfa844726fc

1 files changed, 4 insertions, 4 deletions

diff --git a/test/616-cha-regression-proxy-method/src/Main.java b/test/616-cha-regression-proxy-method/src/Main.java
index 19c92be006..176f80b1bf 100644
--- a/test/616-cha-regression-proxy-method/src/Main.java
+++ b/test/616-cha-regression-proxy-method/src/Main.java
@@ -70,7 +70,7 @@ public class Main {
 
   // sMain1.foo() will be always be Main1.foo() before Main2 is loaded/linked.
   // So sMain1.foo() can be devirtualized to Main1.foo() and be inlined.
-  // After Dummy.createMain2() which links in Main2, live testOverride() on stack
+  // After Helper.createMain2() which links in Main2, live testOverride() on stack
   // should be deoptimized.
   static void testOverride() {
     sMain1.foo(sMain1.getClass() == Main1.class ? 1 : 2);
@@ -79,14 +79,14 @@ public class Main {
     while (!sOtherThreadStarted);
     // Create an Main2 instance and assign it to sMain2.
     // sMain1 is kept the same.
-    sMain2 = Dummy.createMain2();
+    sMain2 = Helper.createMain2();
     // Wake up the other thread.
     synchronized(Main.class) {
       Main.class.notify();
     }
 
     // There should be a deoptimization here right after Main2 is linked by
-    // calling Dummy.createMain2(), even though sMain1 didn't change.
+    // calling Helper.createMain2(), even though sMain1 didn't change.
     // The behavior here would be different if inline-cache is used, which
     // doesn't deoptimize since sMain1 still hits the type cache.
     sMain1.foo(sMain1.getClass() == Main1.class ? 1 : 2);
@@ -124,7 +124,7 @@ public class Main {
 }
 
 // Put createMain2() in another class to avoid class loading due to verifier.
-class Dummy {
+class Helper {
   static Main1 createMain2() {
     return new Main2();
   }