diff options
| author | 2016-01-29 11:08:21 +0000 | |
|---|---|---|
| committer | 2016-01-29 11:08:21 +0000 | |
| commit | 87d38b73fefe904feffa2c22036b8e822f1652f6 (patch) | |
| tree | b256f7b2e6759c6a456661ccc652695a0e91a9b4 /compiler/optimizing | |
| parent | 4cd4c399bf3218c28770e175bb7fed58816b21ca (diff) | |
| parent | adda435ebb3b678b1920a99d18d63c78031bee83 (diff) | |
Merge "Optimizing: Use dex pc 0 for pattern substitution-generated IGET."
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 51fef7c9cb..a839d2dee8 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -669,7 +669,9 @@ HInstanceFieldGet* HInliner::CreateInstanceFieldGet(ArtMethod* resolved_method, resolved_field->GetDeclaringClass()->GetDexClassDefIndex(), *resolved_method->GetDexFile(), dex_cache, - kNoDexPc); + // Read barrier generates a runtime call in slow path and we need a valid + // dex pc for the associated stack map. 0 is bogus but valid. Bug: 26854537. + /* dex_pc */ 0); if (iget->GetType() == Primitive::kPrimNot) { ReferenceTypePropagation rtp(graph_, handles_); rtp.Visit(iget); @@ -696,7 +698,9 @@ HInstanceFieldSet* HInliner::CreateInstanceFieldSet(ArtMethod* resolved_method, resolved_field->GetDeclaringClass()->GetDexClassDefIndex(), *resolved_method->GetDexFile(), dex_cache, - kNoDexPc); + // Read barrier generates a runtime call in slow path and we need a valid + // dex pc for the associated stack map. 0 is bogus but valid. Bug: 26854537. + /* dex_pc */ 0); return iput; } bool HInliner::TryBuildAndInline(ArtMethod* resolved_method, |