diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-08 03:20:54 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-08 03:20:54 -0800 |
| commit | 875ffee6f23971466f3655a9e1e73ba6a1dc0393 (patch) | |
| tree | 07b88bebf3229933589c6f98fe8ff2ae051c1181 /compiler/optimizing | |
| parent | 29bd42b5eb0382360e3a8cb646ccf4de4b3b1d5a (diff) | |
| parent | 1dff62f822392dd3f95ec23ba578bf42430ba112 (diff) | |
| download | art-875ffee6f23971466f3655a9e1e73ba6a1dc0393.zip art-875ffee6f23971466f3655a9e1e73ba6a1dc0393.tar.gz art-875ffee6f23971466f3655a9e1e73ba6a1dc0393.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/art into HEAD
Android 6.0.1 release 3
Change-Id: I23fd56f2c1a3e8e8b993a151a794e18f3569912e
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/reference_type_propagation.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc index 40ec46c..f8e4d10 100644 --- a/compiler/optimizing/reference_type_propagation.cc +++ b/compiler/optimizing/reference_type_propagation.cc @@ -316,7 +316,9 @@ bool ReferenceTypePropagation::UpdateNullability(HInstruction* instr) { void ReferenceTypePropagation::ProcessWorklist() { while (!worklist_.IsEmpty()) { HInstruction* instruction = worklist_.Pop(); - if (UpdateNullability(instruction) || UpdateReferenceTypeInfo(instruction)) { + bool updated_nullability = UpdateNullability(instruction); + bool updated_reference_type = UpdateReferenceTypeInfo(instruction); + if (updated_nullability || updated_reference_type) { AddDependentInstructionsToWorklist(instruction); } } |