Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1262)

Issue 1707703002: Revert of More simplification and unification of frame handling (Closed)

Created:
4 years, 10 months ago by danno
Modified:
4 years, 7 months ago
CC:
v8-reviews_googlegroups.com, v8-x87-ports_googlegroups.com, Jarin
Base URL:
https://chromium.googlesource.com/v8/v8.git@master
Target Ref:
refs/pending/heads/master
Project:
v8
Visibility:
Public.

Description

Revert of More simplification and unification of frame handling (patchset #5 id:80001 of https://codereview.chromium.org/1702593002/ ) Reason for revert: Breaks no snap Original issue's description: > More simplification and unification of frame handling > > Frame slots indexes numbers are used more consistently for > computation in both TurboFan and Crankshaft. Specifically, > Crankshaft now uses frame slot indexes in LChunk, removing > the need for some special-case maths when building the > deoptimization translation table. > > LOG=N > R=mstarzinger@chromium.org > > Committed: https://crrev.com/81423b84dbb2eaf7e1a57b0f6029fc8e643b4755 > Cr-Commit-Position: refs/heads/master@{#34078} TBR=mstarzinger@chromium.org,jarin@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+151 lines, -160 lines) Patch
M src/compiler/frame.h View 2 chunks +26 lines, -7 lines 0 comments Download
M src/compiler/ia32/code-generator-ia32.cc View 2 chunks +1 line, -2 lines 0 comments Download
M src/crankshaft/arm/lithium-arm.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M src/crankshaft/arm/lithium-codegen-arm.h View 2 chunks +5 lines, -9 lines 0 comments Download
M src/crankshaft/arm/lithium-codegen-arm.cc View 5 chunks +9 lines, -3 lines 0 comments Download
M src/crankshaft/arm64/lithium-arm64.cc View 2 chunks +5 lines, -2 lines 0 comments Download
M src/crankshaft/arm64/lithium-codegen-arm64.h View 2 chunks +5 lines, -9 lines 0 comments Download
M src/crankshaft/arm64/lithium-codegen-arm64.cc View 4 chunks +8 lines, -2 lines 0 comments Download
M src/crankshaft/ia32/lithium-codegen-ia32.h View 2 chunks +5 lines, -9 lines 0 comments Download
M src/crankshaft/ia32/lithium-codegen-ia32.cc View 5 chunks +9 lines, -3 lines 0 comments Download
M src/crankshaft/ia32/lithium-ia32.cc View 3 chunks +4 lines, -5 lines 0 comments Download
M src/crankshaft/lithium.h View 3 chunks +4 lines, -9 lines 0 comments Download
M src/crankshaft/lithium.cc View 3 chunks +18 lines, -4 lines 0 comments Download
M src/crankshaft/mips/lithium-codegen-mips.h View 2 chunks +5 lines, -9 lines 0 comments Download
M src/crankshaft/mips/lithium-codegen-mips.cc View 5 chunks +9 lines, -3 lines 0 comments Download
M src/crankshaft/mips/lithium-mips.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M src/crankshaft/mips64/lithium-codegen-mips64.h View 2 chunks +5 lines, -9 lines 0 comments Download
M src/crankshaft/mips64/lithium-codegen-mips64.cc View 5 chunks +10 lines, -4 lines 0 comments Download
M src/crankshaft/mips64/lithium-mips64.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M src/crankshaft/x64/lithium-codegen-x64.h View 2 chunks +5 lines, -9 lines 0 comments Download
M src/crankshaft/x64/lithium-codegen-x64.cc View 4 chunks +8 lines, -2 lines 0 comments Download
M src/crankshaft/x64/lithium-x64.cc View 2 chunks +4 lines, -5 lines 0 comments Download
M src/frames.h View 2 chunks +0 lines, -46 lines 0 comments Download

Messages

Total messages: 5 (2 generated)
danno
Created Revert of More simplification and unification of frame handling
4 years, 10 months ago (2016-02-17 15:44:02 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1707703002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1707703002/1
4 years, 10 months ago (2016-02-17 15:44:11 UTC) #2
commit-bot: I haz the power
4 years, 10 months ago (2016-02-17 15:44:24 UTC) #4
Failed to apply patch for src/crankshaft/arm/lithium-arm.cc:
While running git apply --index -3 -p1;
  error: patch failed: src/crankshaft/arm/lithium-arm.cc:383
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: src/crankshaft/arm/lithium-arm.cc: patch does not apply

Patch:       src/crankshaft/arm/lithium-arm.cc
Index: src/crankshaft/arm/lithium-arm.cc
diff --git a/src/crankshaft/arm/lithium-arm.cc
b/src/crankshaft/arm/lithium-arm.cc
index
6eb9337f5cb4627afc2dcadd7055e6f2adad2c94..d4e7ec936d373e7f9df69ce19a705c894012ba9c
100644
--- a/src/crankshaft/arm/lithium-arm.cc
+++ b/src/crankshaft/arm/lithium-arm.cc
@@ -383,8 +383,8 @@
 
 int LPlatformChunk::GetNextSpillIndex(RegisterKind kind) {
   // Skip a slot if for a double-width slot.
-  if (kind == DOUBLE_REGISTERS) current_frame_slots_++;
-  return current_frame_slots_++;
+  if (kind == DOUBLE_REGISTERS) spill_slot_count_++;
+  return spill_slot_count_++;
 }
 
 
@@ -2456,7 +2456,6 @@
       Retry(kTooManySpillSlotsNeededForOSR);
       spill_index = 0;
     }
-    spill_index += StandardFrameConstants::kFixedSlotCount;
   }
   return DefineAsSpilled(new(zone()) LUnknownOSRValue, spill_index);
 }

Powered by Google App Engine
This is Rietveld 408576698