diff options
| -rw-r--r-- | compiler/optimizing/builder.cc | 5 | ||||
| -rw-r--r-- | test/800-smali/expected.txt | 1 | ||||
| -rw-r--r-- | test/800-smali/smali/b_21865464.smali | 29 | ||||
| -rw-r--r-- | test/800-smali/src/Main.java | 2 |
4 files changed, 32 insertions, 5 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 793dd28157..946c0602cf 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -1463,21 +1463,16 @@ bool HGraphBuilder::AnalyzeDexInstruction(const Instruction& instruction, uint32 } case Instruction::RETURN: { - DCHECK_NE(return_type_, Primitive::kPrimNot); - DCHECK_NE(return_type_, Primitive::kPrimLong); - DCHECK_NE(return_type_, Primitive::kPrimDouble); BuildReturn(instruction, return_type_); break; } case Instruction::RETURN_OBJECT: { - DCHECK(return_type_ == Primitive::kPrimNot); BuildReturn(instruction, return_type_); break; } case Instruction::RETURN_WIDE: { - DCHECK(return_type_ == Primitive::kPrimDouble || return_type_ == Primitive::kPrimLong); BuildReturn(instruction, return_type_); break; } diff --git a/test/800-smali/expected.txt b/test/800-smali/expected.txt index 85656374c5..5927ee3859 100644 --- a/test/800-smali/expected.txt +++ b/test/800-smali/expected.txt @@ -17,4 +17,5 @@ MoveExceptionOnEntry EmptySparseSwitch b/20224106 b/17410612 +b/21865464 Done! diff --git a/test/800-smali/smali/b_21865464.smali b/test/800-smali/smali/b_21865464.smali new file mode 100644 index 0000000000..df56a54aaa --- /dev/null +++ b/test/800-smali/smali/b_21865464.smali @@ -0,0 +1,29 @@ +# 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. + +.class public LB21865464; + +.super Ljava/lang/Object; + +.method public static run()V + .registers 2 + return-void + goto :start + :start + # The following is dead code but used to crash the compiler. + const/4 v0, 0 + return-wide v0 + return v0 + return-object v0 +.end method diff --git a/test/800-smali/src/Main.java b/test/800-smali/src/Main.java index 33df06d87a..0e11519354 100644 --- a/test/800-smali/src/Main.java +++ b/test/800-smali/src/Main.java @@ -83,6 +83,8 @@ public class Main { 0)); testCases.add(new TestCase("b/17410612", "B17410612", "run", null, new VerifyError(), 0)); + testCases.add(new TestCase("b/21865464", "B21865464", "run", null, null, + null)); } public void runTests() { |