commit 07a9a25a9c531d59b070aa5d60852b903bf4f141
author Nicolas Geoffray <ngeoffray@google.com> Wed Dec 16 09:46:22 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 16 09:46:22 2015 +0000
tree b2138265961f3786e3c957d8d26caadc0cf028c7
parent 5ab887acb9a72d863256e7615eca0dde6a0d3d56
parent c9f66d5d31c9d9bb3750b89fd5d7919e4c771b52

Merge "Revert "ART: Set RTI of Arm64IntermediateAddress"" am: 96f721dd41
am: c9f66d5d31

* commit 'c9f66d5d31c9d9bb3750b89fd5d7919e4c771b52':
  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