diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-06-22 11:25:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-22 11:25:03 +0000 |
| commit | bbcec62c0484fbfb82ee2c317e8afa478a63027b (patch) | |
| tree | 1bdf1f27b72b9f8ca73cac20674f68a1eba78897 /compiler | |
| parent | 39eb41f6ad5af18fb9225e5898f20e348e1a7d75 (diff) | |
| parent | be438619f63bcfa954fbc2cd19fd3d62e20fc379 (diff) | |
| download | art-bbcec62c0484fbfb82ee2c317e8afa478a63027b.zip art-bbcec62c0484fbfb82ee2c317e8afa478a63027b.tar.gz art-bbcec62c0484fbfb82ee2c317e8afa478a63027b.tar.bz2 | |
Merge "Don't check the return type in the builder." into mnc-dev
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; } |