commit 93edf73a5fecd526920fbd870068fa592376ac8a
author Calin Juravle <calin@google.com> Tue Jan 20 20:14:07 2015 +0000
committer Calin Juravle <calin@google.com> Tue Jan 20 20:14:07 2015 +0000
tree c24e0223e6ff0d1ec2eefeb1d863c1c32ca5f65c
parent 97d9f286971a4c1eec70e08f9f18f990d21780d5

Use CompilerOptions for implicit stack overflow checks

Change-Id: I52744382a7e3d2c6c11a43e027d87bf43ec4e62b

compiler/optimizing/code_generator_x86.cc

diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 9052b8f..5b09fc1 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -31,8 +31,6 @@
 
 namespace x86 {
 
-static constexpr bool kExplicitStackOverflowCheck = false;
-
 static constexpr int kNumberOfPushedRegistersAtEntry = 1;
 static constexpr int kCurrentMethodStackOffset = 0;
 
@@ -470,7 +468,9 @@
 
   bool skip_overflow_check =
       IsLeafMethod() && !FrameNeedsStackCheck(GetFrameSize(), InstructionSet::kX86);
-  if (!skip_overflow_check && !kExplicitStackOverflowCheck) {
+  bool implicitStackOverflowChecks = GetCompilerOptions().GetImplicitStackOverflowChecks();
+
+  if (!skip_overflow_check && implicitStackOverflowChecks) {
     __ testl(EAX, Address(ESP, -static_cast<int32_t>(GetStackOverflowReservedBytes(kX86))));
     RecordPcInfo(nullptr, 0);
   }
@@ -478,7 +478,7 @@
   // The return PC has already been pushed on the stack.
   __ subl(ESP, Immediate(GetFrameSize() - kNumberOfPushedRegistersAtEntry * kX86WordSize));
 
-  if (!skip_overflow_check && kExplicitStackOverflowCheck) {
+  if (!skip_overflow_check && !implicitStackOverflowChecks) {
     SlowPathCodeX86* slow_path = new (GetGraph()->GetArena()) StackOverflowCheckSlowPathX86();
     AddSlowPath(slow_path);