commit e6f49b47b6a4dc9c7684e4483757872cfc7ff1a1
author Calin Juravle <calin@google.com> Thu Sep 17 14:04:33 2015 +0000
committer Calin Juravle <calin@google.com> Thu Sep 17 14:04:33 2015 +0000
tree 6a5f45136832f73138ced75fcd3c6110b74116ea
parent 23a8e35481face09183a24b9d11e505597c75ebb

Revert "Support unresolved fields in optimizing"
breaks debuggable tests.

This reverts commit 23a8e35481face09183a24b9d11e505597c75ebb.

Change-Id: I8e60b5c8f48525975f25d19e5e8066c1c94bd2e5

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index c774bf0..531b669 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -19,6 +19,7 @@
 #include "arch/arm64/instruction_set_features_arm64.h"
 #include "art_method.h"
 #include "code_generator_utils.h"
+#include "common_arm64.h"
 #include "compiled_method.h"
 #include "entrypoints/quick/quick_entrypoints.h"
 #include "entrypoints/quick/quick_entrypoints_enum.h"
@@ -720,46 +721,6 @@
   __ Mov(RegisterFrom(location, Primitive::kPrimInt), value);
 }
 
-void CodeGeneratorARM64::AddLocationAsTemp(Location location, LocationSummary* locations) {
-  if (location.IsRegister()) {
-    locations->AddTemp(location);
-  } else {
-    UNIMPLEMENTED(FATAL) << "AddLocationAsTemp not implemented for location " << location;
-  }
-}
-
-void CodeGeneratorARM64::MoveLocationToTemp(Location source,
-                                          const LocationSummary& locations,
-                                          int temp_index,
-                                          Primitive::Type type) {
-  if (!Primitive::IsFloatingPointType(type)) {
-    UNIMPLEMENTED(FATAL) << "MoveLocationToTemp not implemented for type " << type;
-  }
-
-  DCHECK(source.IsFpuRegister()) << source;
-  Primitive::Type temp_type = Primitive::Is64BitType(type)
-      ? Primitive::kPrimLong
-      : Primitive::kPrimInt;
-  __ Fmov(RegisterFrom(locations.GetTemp(temp_index), temp_type),
-          FPRegisterFrom(source, type));
-}
-
-void CodeGeneratorARM64::MoveTempToLocation(const LocationSummary& locations,
-                                          int temp_index,
-                                          Location destination,
-                                          Primitive::Type type) {
-  if (!Primitive::IsFloatingPointType(type)) {
-    UNIMPLEMENTED(FATAL) << "MoveLocationToTemp not implemented for type " << type;
-  }
-
-  DCHECK(destination.IsFpuRegister()) << destination;
-  Primitive::Type temp_type = Primitive::Is64BitType(type)
-      ? Primitive::kPrimLong
-      : Primitive::kPrimInt;
-  __ Fmov(FPRegisterFrom(destination, type),
-          RegisterFrom(locations.GetTemp(temp_index), temp_type));
-}
-
 Location CodeGeneratorARM64::GetStackLocation(HLoadLocal* load) const {
   Primitive::Type type = load->GetType();
 
@@ -3199,66 +3160,6 @@
   HandleFieldSet(instruction, instruction->GetFieldInfo(), instruction->GetValueCanBeNull());
 }
 
-void LocationsBuilderARM64::VisitUnresolvedInstanceFieldGet(
-    HUnresolvedInstanceFieldGet* instruction) {
-  FieldAccessCallingConvetionARM64 calling_convention;
-  codegen_->CreateUnresolvedFieldLocationSummary(
-      instruction, instruction->GetFieldType(), calling_convention);
-}
-
-void InstructionCodeGeneratorARM64::VisitUnresolvedInstanceFieldGet(
-    HUnresolvedInstanceFieldGet* instruction) {
-  codegen_->GenerateUnresolvedFieldAccess(instruction,
-                                          instruction->GetFieldType(),
-                                          instruction->GetFieldIndex(),
-                                          instruction->GetDexPc());
-}
-
-void LocationsBuilderARM64::VisitUnresolvedInstanceFieldSet(
-    HUnresolvedInstanceFieldSet* instruction) {
-  FieldAccessCallingConvetionARM64 calling_convention;
-  codegen_->CreateUnresolvedFieldLocationSummary(
-      instruction, instruction->GetFieldType(), calling_convention);
-}
-
-void InstructionCodeGeneratorARM64::VisitUnresolvedInstanceFieldSet(
-    HUnresolvedInstanceFieldSet* instruction) {
-  codegen_->GenerateUnresolvedFieldAccess(instruction,
-                                          instruction->GetFieldType(),
-                                          instruction->GetFieldIndex(),
-                                          instruction->GetDexPc());
-}
-
-void LocationsBuilderARM64::VisitUnresolvedStaticFieldGet(
-    HUnresolvedStaticFieldGet* instruction) {
-  FieldAccessCallingConvetionARM64 calling_convention;
-  codegen_->CreateUnresolvedFieldLocationSummary(
-      instruction, instruction->GetFieldType(), calling_convention);
-}
-
-void InstructionCodeGeneratorARM64::VisitUnresolvedStaticFieldGet(
-    HUnresolvedStaticFieldGet* instruction) {
-  codegen_->GenerateUnresolvedFieldAccess(instruction,
-                                          instruction->GetFieldType(),
-                                          instruction->GetFieldIndex(),
-                                          instruction->GetDexPc());
-}
-
-void LocationsBuilderARM64::VisitUnresolvedStaticFieldSet(
-    HUnresolvedStaticFieldSet* instruction) {
-  FieldAccessCallingConvetionARM64 calling_convention;
-  codegen_->CreateUnresolvedFieldLocationSummary(
-      instruction, instruction->GetFieldType(), calling_convention);
-}
-
-void InstructionCodeGeneratorARM64::VisitUnresolvedStaticFieldSet(
-    HUnresolvedStaticFieldSet* instruction) {
-  codegen_->GenerateUnresolvedFieldAccess(instruction,
-                                          instruction->GetFieldType(),
-                                          instruction->GetFieldIndex(),
-                                          instruction->GetDexPc());
-}
-
 void LocationsBuilderARM64::VisitSuspendCheck(HSuspendCheck* instruction) {
   new (GetGraph()->GetArena()) LocationSummary(instruction, LocationSummary::kCallOnSlowPath);
 }