Reviewers: Benedikt Meurer,
Description:
Version 4.6.85.9 (cherry-pick)
Merged 28f07b1c2b62d0757180efdee898016d61e434c1
[turbofan] Fix unified stack slots for embedded constant pools.
[email protected]
BUG=
Please review this at https://codereview.chromium.org/1307223007/
Base URL: https://chromium.googlesource.com/v8/[email protected]
Affected files (+4, -2 lines):
M include/v8-version.h
M src/compiler/pipeline.cc
M src/frames.h
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index
31f95cac7685280e13dc107bf6385289a53c78c3..0e83e83381d4d3acbc3a1fd0c87fd63622c632e4
100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 4
#define V8_MINOR_VERSION 6
#define V8_BUILD_NUMBER 85
-#define V8_PATCH_LEVEL 8
+#define V8_PATCH_LEVEL 9
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Index: src/compiler/pipeline.cc
diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc
index
a528cceea523644bdb575f61f76958bce3e6fdcd..964d77fe139a0deb689972bb2911745de2afc9df
100644
--- a/src/compiler/pipeline.cc
+++ b/src/compiler/pipeline.cc
@@ -266,7 +266,8 @@ class PipelineData {
int fixed_frame_size = 0;
if (descriptor != nullptr) {
fixed_frame_size = (descriptor->kind() ==
CallDescriptor::kCallAddress)
- ?
StandardFrameConstants::kFixedSlotCountAboveFp
+ ?
StandardFrameConstants::kFixedSlotCountAboveFp +
+ StandardFrameConstants::kCPSlotCount
: StandardFrameConstants::kFixedSlotCount;
}
frame_ = new (instruction_zone()) Frame(fixed_frame_size);
Index: src/frames.h
diff --git a/src/frames.h b/src/frames.h
index
fecaec6fb75121f4a1aae774875c9caa2dfb5315..72250e37a1756c6e3d2371cede557c2d6113f3cc
100644
--- a/src/frames.h
+++ b/src/frames.h
@@ -126,6 +126,7 @@ class StandardFrameConstants : public AllStatic {
static const int kFixedSlotCountAboveFp =
kFixedFrameSizeAboveFp / kPointerSize;
static const int kFixedSlotCount = kFixedFrameSize / kPointerSize;
+ static const int kCPSlotCount = kCPSlotSize / kPointerSize;
static const int kExpressionsOffset = -3 * kPointerSize - kCPSlotSize;
static const int kMarkerOffset = -2 * kPointerSize - kCPSlotSize;
static const int kContextOffset = -1 * kPointerSize - kCPSlotSize;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
