commit 49a19f38c35605e675eee271691ed465802859bf
author Andra Danciu <andradanciu@google.com> Thu Aug 27 12:44:25 2020 +0000
committer Vladimir Marko <vmarko@google.com> Fri Aug 28 11:18:16 2020 +0000
tree cc65dba30611c13bd3c6a6a7e1331541015ad013
parent 0280e5d21e387812b7a1719d75ef2e3a94280c60

X86: Replace VarHandle.get() return type check with CheckCast node

This commit removes the varType check against the callsite return type.
The check is done after by an added HCheckCast node.

Test: art/test.py --host --32 -r -t 712-varhandle-invocations
Bug: 65872996
Change-Id: If4d966e0087da28349390474188e10dfb6f63832

compiler/optimizing/instruction_builder.h

diff --git a/compiler/optimizing/instruction_builder.h b/compiler/optimizing/instruction_builder.h
index 04f2a22..e75fa52 100644
--- a/compiler/optimizing/instruction_builder.h
+++ b/compiler/optimizing/instruction_builder.h
@@ -203,6 +203,10 @@
                               uint32_t dex_pc);
 
   // Builds a `HInstanceOf`, or a `HCheckCast` instruction.
+  void BuildTypeCheck(bool is_instance_of,
+                      HInstruction* object,
+                      dex::TypeIndex type_index,
+                      uint32_t dex_pc);
   void BuildTypeCheck(const Instruction& instruction,
                       uint8_t destination,
                       uint8_t reference,