| commit | e36ae9435da21542891ceeebb3328f5066c8301e | [log] [tgz] |
|---|---|---|
| author | David Brazdil <dbrazdil@google.com> | Mon Dec 14 14:25:44 2015 +0000 |
| committer | David Brazdil <dbrazdil@google.com> | Mon Dec 14 14:25:44 2015 +0000 |
| tree | 11b827c7638935b9199b5325ba0c85867d98f115 | |
| parent | 795accfff05abfb69f54003ee3f096ef3ff6f1e4 [diff] |
ART: Set RTI of Arm64IntermediateAddress Fixes the arm64 build after I7a3aee1ff66c82d64b4846611c547af17e91d260. Change-Id: Ic2c72df59e0ddbdf2edc8519a6954d078a5ef596
diff --git a/compiler/optimizing/instruction_simplifier_arm64.cc b/compiler/optimizing/instruction_simplifier_arm64.cc index 6a34b13..6bbc751 100644 --- a/compiler/optimizing/instruction_simplifier_arm64.cc +++ b/compiler/optimizing/instruction_simplifier_arm64.cc
@@ -49,6 +49,7 @@ 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