diff options
author | Calin Juravle <calin@google.com> | 2015-10-16 18:21:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-16 18:21:03 +0000 |
commit | 163a7bcc8a422f43e550c91f3b1f421159bab017 (patch) | |
tree | c6894555e7590bad0ae4bee565e64b8907651f4f | |
parent | 0f717e93a9942df4ae84747f0b43997807b4596e (diff) | |
parent | 54d8f4bc810e7e0767f44cb77e5706a232b644bb (diff) | |
download | art-163a7bcc8a422f43e550c91f3b1f421159bab017.tar.gz art-163a7bcc8a422f43e550c91f3b1f421159bab017.tar.bz2 art-163a7bcc8a422f43e550c91f3b1f421159bab017.zip |
am 54d8f4bc: Fix in reference type propagation
* commit '54d8f4bc810e7e0767f44cb77e5706a232b644bb':
Fix in reference type propagation
-rw-r--r-- | compiler/optimizing/reference_type_propagation.cc | 4 | ||||
-rw-r--r-- | test/529-checker-rtp-bug/expected.txt | 0 | ||||
-rw-r--r-- | test/529-checker-rtp-bug/info.txt | 1 | ||||
-rw-r--r-- | test/529-checker-rtp-bug/src/Main.java | 48 |
4 files changed, 52 insertions, 1 deletions
diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc index 40ec46c160..f8e4d10733 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); } } diff --git a/test/529-checker-rtp-bug/expected.txt b/test/529-checker-rtp-bug/expected.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/529-checker-rtp-bug/expected.txt diff --git a/test/529-checker-rtp-bug/info.txt b/test/529-checker-rtp-bug/info.txt new file mode 100644 index 0000000000..852cd7c1b4 --- /dev/null +++ b/test/529-checker-rtp-bug/info.txt @@ -0,0 +1 @@ +Test that we set the proper types for objects (b/25008765). diff --git a/test/529-checker-rtp-bug/src/Main.java b/test/529-checker-rtp-bug/src/Main.java new file mode 100644 index 0000000000..cf5b6013e4 --- /dev/null +++ b/test/529-checker-rtp-bug/src/Main.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +final class Final { } + +public class Main { + // CHECK-START: Final Main.testKeepCheckCast(java.lang.Object, boolean) reference_type_propagation (after) + // CHECK: [[Phi:l\d+]] Phi + // CHECK: [[Class:l\d+]] LoadClass + // CHECK: CheckCast [ [[Phi]] [[Class]] ] + // CHECK: Return [ [[Phi]] ] + + // CHECK-START: Final Main.testKeepCheckCast(java.lang.Object, boolean) instruction_simplifier_after_types (after) + // CHECK: [[Phi:l\d+]] Phi + // CHECK: [[Class:l\d+]] LoadClass + // CHECK: CheckCast + // CHECK: Return [ [[Phi]] ] + public static Final testKeepCheckCast(Object o, boolean cond) { + Object x = new Final(); + while (cond) { + x = o; + cond = false; + } + return (Final) x; + } + + public static void main(String[] args) { + try { + testKeepCheckCast(new Object(), true); + throw new Error("Expected check cast exception"); + } catch (ClassCastException e) { + // expected + } + } +} |