From ba6b679bd34449ec56508966706ca1b8d5e7cb17 Mon Sep 17 00:00:00 2001 From: Artem Serov Date: Mon, 15 Aug 2016 14:22:07 +0100 Subject: ARM: Purge Arm32Assembler. Use Thumb2Assembler always. This originated from finding out that the JNI tests are run using the Arm32Assembler however in real world Thumb2Assembler is used for JNI. Therefore Arm32Assembler code is dead except its own tests and the illegitimate use in JNI tests. Change-Id: I9ca6b83582bf97149a46690518ccb9312b1a3b68 --- compiler/optimizing/optimizing_compiler.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'compiler/optimizing/optimizing_compiler.cc') diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index a1da20bae4..698b0b6d43 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -833,9 +833,7 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* arena, // Always use the Thumb-2 assembler: some runtime functionality // (like implicit stack overflow checks) assume Thumb-2. - if (instruction_set == kArm) { - instruction_set = kThumb2; - } + DCHECK_NE(instruction_set, kArm); // Do not attempt to compile on architectures we do not support. if (!IsInstructionSetSupported(instruction_set)) { -- cgit v1.2.3-59-g8ed1b