diff options
| -rw-r--r-- | compiler/optimizing/reference_type_propagation.cc | 15 | ||||
| -rw-r--r-- | test/559-checker-rtp-ifnotnull/expected.txt | 0 | ||||
| -rw-r--r-- | test/559-checker-rtp-ifnotnull/info.txt | 2 | ||||
| -rw-r--r-- | test/559-checker-rtp-ifnotnull/src/Main.java | 53 |
4 files changed, 66 insertions, 4 deletions
diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc index e55061c92a..1c25e4824c 100644 --- a/compiler/optimizing/reference_type_propagation.cc +++ b/compiler/optimizing/reference_type_propagation.cc @@ -583,11 +583,18 @@ void RTPVisitor::VisitBoundType(HBoundType* instr) { if (class_rti.GetTypeHandle()->CannotBeAssignedFromOtherTypes()) { instr->SetReferenceTypeInfo( ReferenceTypeInfo::Create(class_rti.GetTypeHandle(), /* is_exact */ true)); - } else if (obj_rti.IsValid() && class_rti.IsSupertypeOf(obj_rti)) { - instr->SetReferenceTypeInfo(obj_rti); + } else if (obj_rti.IsValid()) { + if (class_rti.IsSupertypeOf(obj_rti)) { + // Object type is more specific. + instr->SetReferenceTypeInfo(obj_rti); + } else { + // Upper bound is more specific. + instr->SetReferenceTypeInfo( + ReferenceTypeInfo::Create(class_rti.GetTypeHandle(), /* is_exact */ false)); + } } else { - instr->SetReferenceTypeInfo( - ReferenceTypeInfo::Create(class_rti.GetTypeHandle(), /* is_exact */ false)); + // Object not typed yet. Leave BoundType untyped for now rather than + // assign the type conservatively. } instr->SetCanBeNull(obj->CanBeNull() && instr->GetUpperCanBeNull()); } else { diff --git a/test/559-checker-rtp-ifnotnull/expected.txt b/test/559-checker-rtp-ifnotnull/expected.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/559-checker-rtp-ifnotnull/expected.txt diff --git a/test/559-checker-rtp-ifnotnull/info.txt b/test/559-checker-rtp-ifnotnull/info.txt new file mode 100644 index 0000000000..c08aa0c5c2 --- /dev/null +++ b/test/559-checker-rtp-ifnotnull/info.txt @@ -0,0 +1,2 @@ +Tests that BoundType created for if-not-null does not force untyped loop phis +to Object.
\ No newline at end of file diff --git a/test/559-checker-rtp-ifnotnull/src/Main.java b/test/559-checker-rtp-ifnotnull/src/Main.java new file mode 100644 index 0000000000..8f401292da --- /dev/null +++ b/test/559-checker-rtp-ifnotnull/src/Main.java @@ -0,0 +1,53 @@ +/* + * 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. + */ + + +public class Main { + + /// CHECK-START: void Main.boundTypeForIfNotNull() ssa_builder (after) + /// CHECK-DAG: <<Method:(i|j)\d+>> CurrentMethod + /// CHECK-DAG: <<Null:l\d+>> NullConstant + /// CHECK-DAG: <<Cst5:i\d+>> IntConstant 5 + /// CHECK-DAG: <<Cst10:i\d+>> IntConstant 10 + + /// CHECK-DAG: InvokeVirtual [<<NullCheck:l\d+>>] + /// CHECK-DAG: <<NullCheck>> NullCheck [<<LoopPhi:l\d+>>] klass:int[] + /// CHECK-DAG: <<LoopPhi>> Phi [<<Null>>,<<MergePhi:l\d+>>] klass:int[] + + /// CHECK-DAG: <<BoundType:l\d+>> BoundType [<<LoopPhi>>] klass:int[] can_be_null:false + /// CHECK-DAG: <<NewArray10:l\d+>> NewArray [<<Cst10>>,<<Method>>] klass:int[] + /// CHECK-DAG: <<NotNullPhi:l\d+>> Phi [<<BoundType>>,<<NewArray10>>] klass:int[] + + /// CHECK-DAG: <<NewArray5:l\d+>> NewArray [<<Cst5>>,<<Method>>] klass:int[] + /// CHECK-DAG: <<MergePhi>> Phi [<<NewArray5>>,<<NotNullPhi>>] klass:int[] + + public static void boundTypeForIfNotNull() { + int[] array = null; + for (int i = -1; i < 10; ++i) { + if (array == null) { + array = new int[5]; + } else { + if (i == 5) { + array = new int[10]; + } + array[i] = i; + } + } + array.hashCode(); + } + + public static void main(String[] args) { } +} |