diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2015-06-18 18:04:12 +0100 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-06-22 12:23:35 +0100 |
commit | be438619f63bcfa954fbc2cd19fd3d62e20fc379 (patch) | |
tree | 41d76bc6b3cb81805bf6a17e6feb2ddb84f031bd /compiler | |
parent | a04e7b7ceae01a7ceda41419e4c639a43e18361e (diff) | |
download | art-be438619f63bcfa954fbc2cd19fd3d62e20fc379.zip art-be438619f63bcfa954fbc2cd19fd3d62e20fc379.tar.gz art-be438619f63bcfa954fbc2cd19fd3d62e20fc379.tar.bz2 |
Don't check the return type in the builder.
The verifier will not complain about dead code. For the compiler,
it is benign.
bug:21863767
(cherry picked from commit 69505f86a1a653bf86c1f2b423b3e0605137d5d1)
Change-Id: I2bc7888b39c91862c6dade130eccdf92f19b3f6f
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/optimizing/builder.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index a53c488..eda2a0d 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -1427,21 +1427,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; } |