commit 96f721dd41f81c967b187d81b6f3e1bcc2a9243c
author Nicolas Geoffray <ngeoffray@google.com> Wed Dec 16 09:34:39 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 16 09:34:39 2015 +0000
tree 6a5f6e02d76be32ccbd5ee38a811785b62ccbe53
parent b059c8a044ed3ede1a0eea4b1e92008ced90c013
parent dce90b9198d523488b8f9a04dfb3834311ff3554

Merge "Revert "ART: Set RTI of Arm64IntermediateAddress""

compiler/optimizing/instruction_simplifier_arm64.cc

diff --git a/compiler/optimizing/instruction_simplifier_arm64.cc b/compiler/optimizing/instruction_simplifier_arm64.cc
index 6bbc751..6a34b13 100644
--- a/compiler/optimizing/instruction_simplifier_arm64.cc
+++ b/compiler/optimizing/instruction_simplifier_arm64.cc
@@ -49,7 +49,6 @@
       GetGraph()->GetIntConstant(mirror::Array::DataOffset(access_size).Uint32Value());
   HArm64IntermediateAddress* address =
       new (arena) HArm64IntermediateAddress(array, offset, kNoDexPc);
-  address->SetReferenceTypeInfo(array->GetReferenceTypeInfo());
   access->GetBlock()->InsertInstructionBefore(address, access);
   access->ReplaceInput(address, 0);
   // Both instructions must depend on GC to prevent any instruction that can