summaryrefslogtreecommitdiff
path: root/deps/v8
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2013-10-07 10:17:04 -0700
committerTimothy J Fontaine <tjfontaine@gmail.com>2013-10-07 10:18:13 -0700
commit711ec07d3402c3494243afe191d6ecd13580fead (patch)
tree4bd1360904a2831cd064d5cdab3aa4b80277044a /deps/v8
parent5b230007adba91163a2f49dbdd9a16d5834fd322 (diff)
downloadnode-711ec07d3402c3494243afe191d6ecd13580fead.tar.gz
v8: ugprade to 3.20.17.14
Diffstat (limited to 'deps/v8')
-rw-r--r--deps/v8/src/hydrogen-instructions.cc19
-rw-r--r--deps/v8/src/hydrogen-instructions.h8
-rw-r--r--deps/v8/src/version.cc2
3 files changed, 23 insertions, 6 deletions
diff --git a/deps/v8/src/hydrogen-instructions.cc b/deps/v8/src/hydrogen-instructions.cc
index bdd9eea5d..e4599e1e8 100644
--- a/deps/v8/src/hydrogen-instructions.cc
+++ b/deps/v8/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);
diff --git a/deps/v8/src/hydrogen-instructions.h b/deps/v8/src/hydrogen-instructions.h
index f2ea7b0cf..60d288525 100644
--- a/deps/v8/src/hydrogen-instructions.h
+++ b/deps/v8/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;
}
diff --git a/deps/v8/src/version.cc b/deps/v8/src/version.cc
index 78f12a166..270bd084e 100644
--- a/deps/v8/src/version.cc
+++ b/deps/v8/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