3 files changed, 2 insertions, 13 deletions
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h
index eb63b49884..4cecd61365 100644
--- a/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@ -294,12 +294,6 @@ class CodeGenerator {
     allocated_registers_.Add(location);
   }
 
-  bool HasAllocatedRegister(bool is_core, int reg) const {
-    return is_core
-        ? allocated_registers_.ContainsCoreRegister(reg)
-        : allocated_registers_.ContainsFloatingPointRegister(reg);
-  }
-
   void AllocateLocations(HInstruction* instruction);
 
   // Tells whether the stack frame of the compiled method is
diff --git a/compiler/optimizing/locations.h b/compiler/optimizing/locations.h
index 4b250465aa..f41a782fe6 100644
--- a/compiler/optimizing/locations.h
+++ b/compiler/optimizing/locations.h
@@ -427,11 +427,11 @@ class RegisterSet : public ValueObject {
     }
   }
 
-  bool ContainsCoreRegister(uint32_t id) const {
+  bool ContainsCoreRegister(uint32_t id) {
     return Contains(core_registers_, id);
   }
 
-  bool ContainsFloatingPointRegister(uint32_t id) const {
+  bool ContainsFloatingPointRegister(uint32_t id) {
     return Contains(floating_point_registers_, id);
   }
 
diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator.cc
index a8e3c2f040..7b23d020c2 100644
--- a/compiler/optimizing/register_allocator.cc
+++ b/compiler/optimizing/register_allocator.cc
@@ -209,8 +209,6 @@ void RegisterAllocator::ProcessInstruction(HInstruction* instruction) {
     Location temp = locations->GetTemp(i);
     if (temp.IsRegister() || temp.IsFpuRegister()) {
       BlockRegister(temp, position, position + 1);
-      // Ensure that an explicit temporary register is marked as being allocated.
-      codegen_->AddAllocatedRegister(temp);
     } else {
       DCHECK(temp.IsUnallocated());
       switch (temp.GetPolicy()) {
@@ -509,9 +507,6 @@ bool RegisterAllocator::ValidateIntervals(const GrowableArray<LiveInterval*>& in
       }
 
       if (current->HasRegister()) {
-        if (kIsDebugBuild && !current->IsFixed()) {
-          DCHECK(codegen.HasAllocatedRegister(processing_core_registers, current->GetRegister()));
-        }
         BitVector* liveness_of_register = liveness_of_values.Get(current->GetRegister());
         for (size_t j = it.CurrentRange()->GetStart(); j < it.CurrentRange()->GetEnd(); ++j) {
           if (liveness_of_register->IsBitSet(j)) {