commit d930929be93798d790c91dd05adf2c038508f1b0
author Nicolas Geoffray <ngeoffray@google.com> Sat Oct 31 22:21:31 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Nov 02 13:45:30 2015 +0000
tree ef7a9b70e2e8f14ae2b49a07ca04b2fa1cee8496
parent 289c4e3a10acb6d0250dc25dd42465ca4d08c762

Fix inlining and lse bugs with unresolved access.

bug:25414532

Change-Id: I48b6660754774ea3e8a62a74175b1aa3728e0151

compiler/optimizing/nodes.h

diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 7df5866..0f2c1cf 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -4750,6 +4750,9 @@
     return generate_clinit_check_;
   }
   void SetMustGenerateClinitCheck(bool generate_clinit_check) {
+    // The entrypoint the code generator is going to call does not do
+    // clinit of the class.
+    DCHECK(!NeedsAccessCheck());
     generate_clinit_check_ = generate_clinit_check;
   }