commit c05a32a746812f16914958bf8769cb6537d3af40
author Vladimir Marko <vmarko@google.com> Fri Apr 29 09:34:04 2022 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 29 10:08:05 2022 +0000
tree 2440f25f09695711285bdda5b2b7c787fa8fdc96
parent 068a875d3ae814c00049d162c92acf791d511edb

Fix `CanUseKnownBootImageVarHandle()`, part 2.

Test: Rely on TreeHugger.
Bug: 191765508
Bug: 230729606
Change-Id: I1955b542cb7c28378aa588cd16e66eb5ffc33c8a

compiler/optimizing/instruction_simplifier.cc

diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 4db258b..789f077 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -2940,7 +2940,7 @@
     DCHECK(!declaring_class->IsInitialized());
     return false;
   }
-  HInstruction* load_class = var_handle_instruction->InputAt(0)->AsLoadClass();
+  HInstruction* load_class = var_handle_instruction->InputAt(0);
   if (kIsDebugBuild) {
     bool is_in_boot_image = false;
     if (Runtime::Current()->GetHeap()->ObjectIsInBootImageSpace(declaring_class)) {