summaryrefslogtreecommitdiffstats
path: root/compiler
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2015-03-17 16:31:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-17 16:31:28 +0000
commita67f4b37b216d3bf84d3e204a0d71d8d4660fab4 (patch)
tree460f18693f53bcbcc6f79b03f8a211f271c973a7 /compiler
parent1311ef7226f6147f2ef8c491321972a79d73914a (diff)
parent68e15009173f92fe717546a621b56413d5e9fba1 (diff)
downloadandroid_art-a67f4b37b216d3bf84d3e204a0d71d8d4660fab4.tar.gz
android_art-a67f4b37b216d3bf84d3e204a0d71d8d4660fab4.tar.bz2
android_art-a67f4b37b216d3bf84d3e204a0d71d8d4660fab4.zip
Merge "PREOPT compiles using dex2oatd so don't emit debug instructions."
Diffstat (limited to 'compiler')
-rw-r--r--compiler/optimizing/code_generator_arm.cc4
-rw-r--r--compiler/optimizing/code_generator_arm64.cc4
-rw-r--r--compiler/optimizing/code_generator_x86.cc4
-rw-r--r--compiler/optimizing/code_generator_x86_64.cc4
4 files changed, 0 insertions, 16 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc
index 123f690763..0a069a75ef 100644
--- a/compiler/optimizing/code_generator_arm.cc
+++ b/compiler/optimizing/code_generator_arm.cc
@@ -903,10 +903,6 @@ void LocationsBuilderARM::VisitExit(HExit* exit) {
void InstructionCodeGeneratorARM::VisitExit(HExit* exit) {
UNUSED(exit);
- if (kIsDebugBuild) {
- __ Comment("Unreachable");
- __ bkpt(0);
- }
}
void LocationsBuilderARM::VisitIf(HIf* if_instr) {
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index c48cab4985..aeec5dd1c4 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -1596,10 +1596,6 @@ void LocationsBuilderARM64::VisitExit(HExit* exit) {
void InstructionCodeGeneratorARM64::VisitExit(HExit* exit) {
UNUSED(exit);
- if (kIsDebugBuild) {
- down_cast<Arm64Assembler*>(GetAssembler())->Comment("Unreachable");
- __ Brk(__LINE__); // TODO: Introduce special markers for such code locations.
- }
}
void LocationsBuilderARM64::VisitFloatConstant(HFloatConstant* constant) {
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 1db16002c0..754dd1088d 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -812,10 +812,6 @@ void LocationsBuilderX86::VisitExit(HExit* exit) {
void InstructionCodeGeneratorX86::VisitExit(HExit* exit) {
UNUSED(exit);
- if (kIsDebugBuild) {
- __ Comment("Unreachable");
- __ int3();
- }
}
void LocationsBuilderX86::VisitIf(HIf* if_instr) {
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 90d87d4b9f..dbd7c9e8ad 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -749,10 +749,6 @@ void LocationsBuilderX86_64::VisitExit(HExit* exit) {
void InstructionCodeGeneratorX86_64::VisitExit(HExit* exit) {
UNUSED(exit);
- if (kIsDebugBuild) {
- __ Comment("Unreachable");
- __ int3();
- }
}
void LocationsBuilderX86_64::VisitIf(HIf* if_instr) {