From 51b8aafd3beb8855a258383a9eb876a783375629 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Fri, 9 Jun 2017 15:17:05 +0100
Subject: Fix HClinitCheck elimination in instruction builder.

To handle escaping instances of erroneous classes correctly,
we can omit the HClinitCheck only when using a class in the
static method of the very same class. Even for superclasses
we need to do the check. The new test exposes the cases
where we were previously diverging from the RI.

Also clean up the CompilerDriver by inlining one function
directly to the HInstructionBuild::IsInitialized(.) and
removing some related functions that are no longer used.

The size of the aosp_taimen-userdebug prebuilts:
  - before:
    arm/boot*.oat: 16891788
    arm64/boot*.oat: 19815520
    oat/arm64/services.odex: 20071624
  - after:
    arm/boot*.oat: 16949532 (+56.4KiB, +0.34%)
    arm64/boot*.oat: 19889752 (+72.5KiB, +0.37%)
    oat/arm64/services.odex: 20224328 (+149.1KiB, +0.76%)
with minor changes to other app prebuilts.

Note: Some of that could be reclaimed by reinstating the old
optimization for classes where no bytecode can be executed
during initialization (no <clinit> to execute in that class
or superclasses).

Test: 174-escaping-instance-of-bad-class
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: testrunner.py --jvm -t 174
Test: Pixel 2 XL boots.
Test: testrunner.py --target --optimizing
Bug: 62478025
Change-Id: I41f026ea7fecc615c06e87f3b6cb847de0ede8a6
---
 test/551-checker-clinit/src/Main.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/551-checker-clinit/src/Main.java')

diff --git a/test/551-checker-clinit/src/Main.java b/test/551-checker-clinit/src/Main.java
index 5ec304808b..86fca80292 100644
--- a/test/551-checker-clinit/src/Main.java
+++ b/test/551-checker-clinit/src/Main.java
@@ -33,15 +33,15 @@ public class Main {
 
 class Sub extends Main {
   /// CHECK-START: void Sub.invokeSuperClass() builder (after)
-  /// CHECK-NOT:                        ClinitCheck
+  /// CHECK:                        ClinitCheck
   public void invokeSuperClass() {
-    int a = Main.foo;
+    int a = Main.foo;  // Class initialization check must be preserved. b/62478025
   }
 
   /// CHECK-START: void Sub.invokeItself() builder (after)
-  /// CHECK-NOT:                        ClinitCheck
+  /// CHECK:                        ClinitCheck
   public void invokeItself() {
-    int a = foo;
+    int a = foo;  // Class initialization check must be preserved. b/62478025
   }
 
   /// CHECK-START: void Sub.invokeSubClass() builder (after)
-- 
cgit v1.2.3-59-g8ed1b