Update V8

Fixes a bug in one of our patches that caused
hydrogen to optimize incorrectly.

Task-number: QTBUG-22679
Change-Id: I008088cd2b878f22e6a2ba4e002aeba9a3c70a22
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
This commit is contained in:
Kent Hansen 2011-11-11 12:45:37 +01:00 committed by Qt by Nokia
parent 9563367af2
commit 198933a043
12 changed files with 31 additions and 27 deletions

2
src/3rdparty/v8 vendored

@ -1 +1 @@
Subproject commit 36be1e6b4af4601faa40ea4a222539c6b48f0e03
Subproject commit 03d5b0219d5bdd14012c97906de9074d80d6e2de

View File

@ -332,5 +332,5 @@ index f7d2180..d96e5f9 100644
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(SeqString);
--
1.7.4.4
1.7.6

View File

@ -357,5 +357,5 @@ index 9c23c2c..0e256c1 100644
return isolate->heap()->undefined_value();
}
--
1.7.4.4
1.7.6

View File

@ -591,5 +591,5 @@ index ed40061..c38d461 100644
--
1.7.4.4
1.7.6

View File

@ -1,4 +1,4 @@
From 6f97385cf3cb17d245e7f3d61ba975183a786220 Mon Sep 17 00:00:00 2001
From b4bb5845077f9b2ad4359360d2e071ed992ede10 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 27 Oct 2011 13:34:16 +0100
Subject: [PATCH 04/11] Introduce a QML compilation mode
@ -37,7 +37,7 @@ runs.
src/full-codegen.h | 1 +
src/heap.cc | 4 ++
src/hydrogen-instructions.cc | 5 +++
src/hydrogen-instructions.h | 16 ++++++++-
src/hydrogen-instructions.h | 21 ++++++++++--
src/hydrogen.cc | 4 ++
src/ia32/code-stubs-ia32.cc | 5 +++
src/ia32/full-codegen-ia32.cc | 28 +++++++++-------
@ -62,7 +62,7 @@ runs.
src/x64/lithium-x64.cc | 4 +-
src/x64/lithium-x64.h | 12 +++++++
src/x64/macro-assembler-x64.h | 5 +++
47 files changed, 490 insertions(+), 117 deletions(-)
47 files changed, 494 insertions(+), 118 deletions(-)
diff --git a/include/v8.h b/include/v8.h
index 3ef4dd6..193e2fe 100644
@ -932,10 +932,10 @@ index 6f46509..ac9728c 100644
stream->Add("%o ", *name());
HUnaryCall::PrintDataTo(stream);
diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h
index 65fc4df..c29d781 100644
index 65fc4df..ebf0030 100644
--- a/src/hydrogen-instructions.h
+++ b/src/hydrogen-instructions.h
@@ -1410,19 +1410,27 @@ class HOuterContext: public HUnaryOperation {
@@ -1410,19 +1410,30 @@ class HOuterContext: public HUnaryOperation {
class HGlobalObject: public HUnaryOperation {
public:
@ -957,14 +957,18 @@ index 65fc4df..c29d781 100644
+ void set_qml_global(bool v) { qml_global_ = v; }
+
protected:
virtual bool DataEquals(HValue* other) { return true; }
- virtual bool DataEquals(HValue* other) { return true; }
+ virtual bool DataEquals(HValue* other) {
+ HGlobalObject* o = HGlobalObject::cast(other);
+ return o->qml_global_ == qml_global_;
+ }
+
+ private:
+ bool qml_global_;
};
@@ -1601,7 +1609,7 @@ class HCallFunction: public HUnaryCall {
@@ -1601,7 +1612,7 @@ class HCallFunction: public HUnaryCall {
class HCallGlobal: public HUnaryCall {
public:
HCallGlobal(HValue* context, Handle<String> name, int argument_count)
@ -973,7 +977,7 @@ index 65fc4df..c29d781 100644
}
virtual void PrintDataTo(StringStream* stream);
@@ -1613,10 +1621,14 @@ class HCallGlobal: public HUnaryCall {
@@ -1613,10 +1624,14 @@ class HCallGlobal: public HUnaryCall {
return Representation::Tagged();
}
@ -2055,5 +2059,5 @@ index f5f81b1..5caa6cf 100644
static inline Operand StackSpaceOperand(int index) {
#ifdef _WIN64
--
1.7.4.4
1.7.6

View File

@ -1,4 +1,4 @@
From a321f382dd8a63ed71cd00a57d011f966a35645f Mon Sep 17 00:00:00 2001
From fcb6d710f3c3aadfc66a9f60e54ddd00144fe64e Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 14 Oct 2011 17:03:06 +1000
Subject: [PATCH 05/11] Allow access to the calling script data
@ -44,5 +44,5 @@ index 2d3d97a..54df40d 100644
v8::Local<v8::Object> Context::Global() {
if (IsDeadCheck(i::Isolate::Current(), "v8::Context::Global()")) {
--
1.7.4.4
1.7.6

View File

@ -1,4 +1,4 @@
From 15e2b05fae59aa4ed7c0974ba296ec8893c4d7f2 Mon Sep 17 00:00:00 2001
From 5d7801496ea41f9d1cf4260cd2b0508929ebde76 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 27 Oct 2011 13:40:00 +0100
Subject: [PATCH 06/11] Add custom object compare callback
@ -544,5 +544,5 @@ index f30221f..ff8337f 100644
ASSERT(GetCondition() == equal);
__ subq(rax, rdx);
--
1.7.4.4
1.7.6

View File

@ -1,4 +1,4 @@
From c9277f820ae47f32f127b156ac2e1200458ab876 Mon Sep 17 00:00:00 2001
From b733a2fec5c51b7d7219505b89f34715603bd49c Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 9 Sep 2011 14:16:12 +1000
Subject: [PATCH 07/11] Allow a script to be flagged as "native"
@ -42,5 +42,5 @@ index 4902e72..cabca74 100644
}
if (!script_name.is_null()) {
--
1.7.4.4
1.7.6

View File

@ -1,4 +1,4 @@
From 8e095c6171d6be5ac3c90fd2a8707579050d5e47 Mon Sep 17 00:00:00 2001
From 35ec23697719708e18a42c40fd80719247ca62e4 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Tue, 7 Dec 2010 11:56:42 +0100
Subject: [PATCH 08/11] QtScript/V8: Add new v8 api to check if a value is an
@ -60,5 +60,5 @@ index 5e90964..6166cde 100644
V(to_string_symbol, "toString") \
V(char_at_symbol, "CharAt") \
--
1.7.4.4
1.7.6

View File

@ -1,4 +1,4 @@
From bf0c62b53bf018a7f0b3e9ea3dcdcbcc0ee6fd53 Mon Sep 17 00:00:00 2001
From 5d8ee260641b6a6b7f50b68c7746f7ee7fe01de5 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Fri, 2 Sep 2011 12:03:09 +0200
Subject: [PATCH 09/11] Fix deprecated Python code
@ -47,5 +47,5 @@ index 646bf14..395441b 100644
if identifier_second_char != 0:
new_identifier = (
--
1.7.4.4
1.7.6

View File

@ -1,4 +1,4 @@
From b79ebeab15653e37390ccfca1f6ee252979844ce Mon Sep 17 00:00:00 2001
From 994dc4b9cb86604c04e02b3b2884eaa389bb62af Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Thu, 25 Aug 2011 11:09:58 +1000
Subject: [PATCH 10/11] Remove execute flag from v8-debug.h
@ -11,5 +11,5 @@ diff --git a/include/v8-debug.h b/include/v8-debug.h
old mode 100755
new mode 100644
--
1.7.4.4
1.7.6

View File

@ -1,4 +1,4 @@
From 36be1e6b4af4601faa40ea4a222539c6b48f0e03 Mon Sep 17 00:00:00 2001
From 03d5b0219d5bdd14012c97906de9074d80d6e2de Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Fri, 27 May 2011 13:04:15 +1000
Subject: [PATCH 11/11] Fix warnings
@ -42,5 +42,5 @@ index d995e54..a7b5c8a 100644
} // namespace internal
--
1.7.4.4
1.7.6