commit 2d999e0588b008ec68a9fbda97dd32fd03c22364
author David Brazdil <dbrazdil@google.com> Tue May 12 16:56:00 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 12 16:56:01 2015 +0000
tree 4d11d83ad937c3d7a34238727e6b5c06bf98942d
parent d62e2d0e936770928b5d155a6c8f720e095f7e4a
parent 258802399dfc34ce4c628f386defa5bfdf8cf2f0

Merge "Revert "ART: Split Checker into smaller files""

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 0222f93..b1cb880 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -979,14 +979,12 @@
   BlockPoolsScope block_pools(GetVIXLAssembler());
   __ Ldr(lr, MemOperand(tr, entry_point_offset));
   __ Blr(lr);
-  if (instruction != nullptr) {
-    RecordPcInfo(instruction, dex_pc, slow_path);
-    DCHECK(instruction->IsSuspendCheck()
-        || instruction->IsBoundsCheck()
-        || instruction->IsNullCheck()
-        || instruction->IsDivZeroCheck()
-        || !IsLeafMethod());
-    }
+  RecordPcInfo(instruction, dex_pc, slow_path);
+  DCHECK(instruction->IsSuspendCheck()
+         || instruction->IsBoundsCheck()
+         || instruction->IsNullCheck()
+         || instruction->IsDivZeroCheck()
+         || !IsLeafMethod());
 }
 
 void InstructionCodeGeneratorARM64::GenerateClassInitializationCheck(SlowPathCodeARM64* slow_path,