When generating code for ia32, make sure that there is enough reloc space

Compare with LCodeGen::FinishCode

BUG=none
R=jarin@chromium.org,mstarzinger@chromium.org
LOG=n

Review URL: https://codereview.chromium.org/777243002

Cr-Commit-Position: refs/heads/master@{#25679}

diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc
index f2489a4676aa2c694c68e980566243495ef11db0..9e0dc903f4d8f53d564d0c96c9a855d2fcf93b52 100644 (file)
--- a/src/compiler/arm/code-generator-arm.cc
+++ b/src/compiler/arm/code-generator-arm.cc
@@ -1104,6 +1104,9 @@ void CodeGenerator::EnsureSpaceForLazyDeopt() {
   MarkLazyDeoptSite();
 }
 
+
+void CodeGenerator::EnsureRelocSpaceForLazyDeopt(Handle<Code> code) {}
+
 #undef __
 
 }  // namespace compiler

diff --git a/src/compiler/arm64/code-generator-arm64.cc b/src/compiler/arm64/code-generator-arm64.cc
index 62145cb445ac56e5758e8a75d05c2a2801904af7..0b21f90c86664f17d2a87e87e99931be868d4b9d 100644 (file)
--- a/src/compiler/arm64/code-generator-arm64.cc
+++ b/src/compiler/arm64/code-generator-arm64.cc
@@ -1159,6 +1159,9 @@ void CodeGenerator::EnsureSpaceForLazyDeopt() {
   MarkLazyDeoptSite();
 }
 
+
+void CodeGenerator::EnsureRelocSpaceForLazyDeopt(Handle<Code> code) {}
+
 #undef __
 
 }  // namespace compiler

diff --git a/src/compiler/code-generator.cc b/src/compiler/code-generator.cc
index d4622c0a351d1962c415bee3d9f92050e1e53d50..4f13b4cfe5beee4c78727d1ec086bab457036808 100644 (file)
--- a/src/compiler/code-generator.cc
+++ b/src/compiler/code-generator.cc
@@ -107,6 +107,8 @@ Handle<Code> CodeGenerator::GenerateCode() {
 
   PopulateDeoptimizationData(result);
 
+  EnsureRelocSpaceForLazyDeopt(result);
+
   // Emit a code line info recording stop event.
   void* line_info = recorder->DetachJITHandlerData();
   LOG_CODE_EVENT(isolate(), CodeEndLinePosInfoRecordEvent(*result, line_info));

diff --git a/src/compiler/code-generator.h b/src/compiler/code-generator.h
index 46610dbde7f5f9cc9796b1215141ae754b00b255..e852e2bb45929c6de36b1a3f90ad2e0abd867ca2 100644 (file)
--- a/src/compiler/code-generator.h
+++ b/src/compiler/code-generator.h
@@ -109,6 +109,7 @@ class CodeGenerator FINAL : public GapResolver::Assembler {
                                 InstructionOperand* op, MachineType type);
   void AddNopForSmiCodeInlining();
   void EnsureSpaceForLazyDeopt();
+  void EnsureRelocSpaceForLazyDeopt(Handle<Code> code);
   void MarkLazyDeoptSite();
 
   // ===========================================================================

diff --git a/src/compiler/ia32/code-generator-ia32.cc b/src/compiler/ia32/code-generator-ia32.cc
index aa1cd547f87a01bddeee98aaa703e5374d691228..bc44ac77a1b2291d675b9e02491a6188374078fd 100644 (file)
--- a/src/compiler/ia32/code-generator-ia32.cc
+++ b/src/compiler/ia32/code-generator-ia32.cc
@@ -1215,6 +1215,11 @@ void CodeGenerator::EnsureSpaceForLazyDeopt() {
   MarkLazyDeoptSite();
 }
 
+
+void CodeGenerator::EnsureRelocSpaceForLazyDeopt(Handle<Code> code) {
+  Deoptimizer::EnsureRelocSpaceForLazyDeoptimization(code);
+}
+
 #undef __
 
 }  // namespace compiler

diff --git a/src/compiler/mips/code-generator-mips.cc b/src/compiler/mips/code-generator-mips.cc
index b808856dc011e6654514067036386be82d137e2c..16e963731120d7be66e7a2e0bfe8336480cc3ce8 100644 (file)
--- a/src/compiler/mips/code-generator-mips.cc
+++ b/src/compiler/mips/code-generator-mips.cc
@@ -1105,6 +1105,9 @@ void CodeGenerator::EnsureSpaceForLazyDeopt() {
   MarkLazyDeoptSite();
 }
 
+
+void CodeGenerator::EnsureRelocSpaceForLazyDeopt(Handle<Code> code) {}
+
 #undef __
 
 }  // namespace compiler

diff --git a/src/compiler/mips64/code-generator-mips64.cc b/src/compiler/mips64/code-generator-mips64.cc
index 8e94ceed2126841ab08b5e5897ccb4621b2be0c9..50437411f87c3ec802ee0438cb5c9bf97a967c92 100644 (file)
--- a/src/compiler/mips64/code-generator-mips64.cc
+++ b/src/compiler/mips64/code-generator-mips64.cc
@@ -1380,6 +1380,9 @@ void CodeGenerator::EnsureSpaceForLazyDeopt() {
   MarkLazyDeoptSite();
 }
 
+
+void CodeGenerator::EnsureRelocSpaceForLazyDeopt(Handle<Code> code) {}
+
 #undef __
 
 }  // namespace compiler

diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
index f2679b0391b01f25dca742d011352471dbee4c7a..471704590ca0605d8d8e363d9198932e35ef295c 100644 (file)
--- a/src/compiler/x64/code-generator-x64.cc
+++ b/src/compiler/x64/code-generator-x64.cc
@@ -1249,6 +1249,9 @@ void CodeGenerator::EnsureSpaceForLazyDeopt() {
   MarkLazyDeoptSite();
 }
 
+
+void CodeGenerator::EnsureRelocSpaceForLazyDeopt(Handle<Code> code) {}
+
 #undef __
 
 }  // namespace internal