diff options
| author | xueliang.zhong <xueliang.zhong@linaro.org> | 2017-10-30 13:43:14 +0000 |
|---|---|---|
| committer | xueliang.zhong <xueliang.zhong@linaro.org> | 2017-11-02 16:17:17 +0000 |
| commit | e0eb48353ddf0c1b79bfec2ba15c899a413c2c70 (patch) | |
| tree | 71dfe896afa05c39d64373518d1e1e36cb8d8d43 /compiler/optimizing/load_store_analysis.h | |
| parent | 3e6c13997373efac343a65740da0c4f6e77338b9 (diff) | |
Fix LSA hunt for original reference bug.
Fix a bug in LSA where it doesn't take IntermediateAddress
into account during hunting for original reference.
In following example, original reference i0 can be transformed
by NullCheck, BoundType, IntermediateAddress, etc.
i0 NewArray
i1 HInstruction(i0)
i2 ArrayGet(i1, index)
Test: test-art-host
Test: test-art-target
Test: load_store_analysis_test
Test: 706-checker-scheduler
Change-Id: I162dd8a86fcd31daee3517357c6af638c950b31b
Diffstat (limited to 'compiler/optimizing/load_store_analysis.h')
| -rw-r--r-- | compiler/optimizing/load_store_analysis.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/optimizing/load_store_analysis.h b/compiler/optimizing/load_store_analysis.h index 5940ee755f..5a1df45914 100644 --- a/compiler/optimizing/load_store_analysis.h +++ b/compiler/optimizing/load_store_analysis.h @@ -196,8 +196,12 @@ class HeapLocationCollector : public HGraphVisitor { } HInstruction* HuntForOriginalReference(HInstruction* ref) const { + // An original reference can be transformed by instructions like: + // i0 NewArray + // i1 HInstruction(i0) <-- NullCheck, BoundType, IntermediateAddress. + // i2 ArrayGet(i1, index) DCHECK(ref != nullptr); - while (ref->IsNullCheck() || ref->IsBoundType()) { + while (ref->IsNullCheck() || ref->IsBoundType() || ref->IsIntermediateAddress()) { ref = ref->InputAt(0); } return ref; |