Reviewers: Jakob,
Description:
Merged r16355 into 3.20 branch.
Filler sizes have to be Smis, fix x64 breakage.
[email protected]
Please review this at https://codereview.chromium.org/25011002/
SVN Base: https://v8.googlecode.com/svn/branches/3.20
Affected files (+23, -6 lines):
M src/hydrogen-instructions.h
M src/hydrogen-instructions.cc
M src/version.cc
Index: src/hydrogen-instructions.cc
diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
index
bdd9eea5df2be0038c2c4caeaf64efd1bc31a313..e4599e1e83d88c2b8a9e05e3f846fd6a9a2b5fb0
100644
--- a/src/hydrogen-instructions.cc
+++ b/src/hydrogen-instructions.cc
@@ -3268,7 +3268,11 @@ void HAllocate::HandleSideEffectDominator(GVNFlag
side_effect,
}
HInstruction* new_dominator_size_constant =
HConstant::CreateAndInsertBefore(
- zone, context(), new_dominator_size, dominator_allocate);
+ zone,
+ context(),
+ new_dominator_size,
+ Representation::None(),
+ dominator_allocate);
dominator_allocate->UpdateSize(new_dominator_size_constant);
#ifdef VERIFY_HEAP
@@ -3371,11 +3375,15 @@ HAllocate*
HAllocate::GetFoldableDominator(HAllocate* dominator) {
void HAllocate::UpdateFreeSpaceFiller(int32_t free_space_size) {
ASSERT(filler_free_space_size_ != NULL);
Zone* zone = block()->zone();
+ // We must explicitly force Smi representation here because on x64 we
+ // would otherwise automatically choose int32, but the actual store
+ // requires a Smi-tagged value.
HConstant* new_free_space_size = HConstant::CreateAndInsertBefore(
zone,
context(),
filler_free_space_size_->value()->GetInteger32Constant() +
free_space_size,
+ Representation::Smi(),
filler_free_space_size_);
filler_free_space_size_->UpdateValue(new_free_space_size);
}
@@ -3401,10 +3409,15 @@ void HAllocate::CreateFreeSpaceFiller(int32_t
free_space_size) {
store_map->SetFlag(HValue::kHasNoObservableSideEffects);
store_map->InsertAfter(filler_map);
+ // We must explicitly force Smi representation here because on x64 we
+ // would otherwise automatically choose int32, but the actual store
+ // requires a Smi-tagged value.
HConstant* filler_size = HConstant::CreateAndInsertAfter(
- zone, context(), free_space_size, store_map);
+ zone, context(), free_space_size, Representation::Smi(), store_map);
+ // Must force Smi representation for x64 (see comment above).
HObjectAccess access =
- HObjectAccess::ForJSObjectOffset(FreeSpace::kSizeOffset);
+ HObjectAccess::ForJSObjectOffset(FreeSpace::kSizeOffset,
+ Representation::Smi());
HStoreNamedField* store_size = HStoreNamedField::New(zone, context(),
free_space_instr, access, filler_size);
store_size->SetFlag(HValue::kHasNoObservableSideEffects);
Index: src/hydrogen-instructions.h
diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h
index
f2ea7b0cf4b409ab41f453f87420a2491f0c6bed..60d2885254253591be914c2207d219c17b8bb937
100644
--- a/src/hydrogen-instructions.h
+++ b/src/hydrogen-instructions.h
@@ -3210,8 +3210,10 @@ class HConstant: public HTemplateInstruction<0> {
static HConstant* CreateAndInsertAfter(Zone* zone,
HValue* context,
int32_t value,
+ Representation representation,
HInstruction* instruction) {
- HConstant* new_constant = HConstant::New(zone, context, value);
+ HConstant* new_constant =
+ HConstant::New(zone, context, value, representation);
new_constant->InsertAfter(instruction);
return new_constant;
}
@@ -3219,8 +3221,10 @@ class HConstant: public HTemplateInstruction<0> {
static HConstant* CreateAndInsertBefore(Zone* zone,
HValue* context,
int32_t value,
+ Representation representation,
HInstruction* instruction) {
- HConstant* new_constant = HConstant::New(zone, context, value);
+ HConstant* new_constant =
+ HConstant::New(zone, context, value, representation);
new_constant->InsertBefore(instruction);
return new_constant;
}
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
78f12a166494878b72a91327e88401338427cffc..270bd084e4b28e76f4b017b991b0abdd4893a98f
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 20
#define BUILD_NUMBER 17
-#define PATCH_LEVEL 13
+#define PATCH_LEVEL 14
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
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/groups/opt_out.
