diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-20 10:31:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-20 13:30:26 +0200 |
| commit | ce5adc76847edf10dc843f5c93485e393f0ca099 (patch) | |
| tree | 26ba0fde1d5a343dba15a5e8be1a78c91e3d6bb4 /src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch | |
| parent | 3885a45e48b7fd680b6cb83e2d0d618fd04cf690 (diff) | |
Revert "Update V8"
This reverts commit 1c4a5fcab76d1b769a4c0369d40dd0dd7c0e7495
Several of the qtdeclarative tests and examples are dying randomly with messages like this:
>
> #
> # Fatal error in ../3rdparty/v8/src/objects-inl.h, line 2169
> # CHECK(object->IsJSFunction()) failed
> #
>
>
> ==== Stack trace ============================================
>
>
> ==== Details ================================================
>
> ==== Key ============================================
>
> =====================
>
> Aborted (core dumped)
Change-Id: Iebaa2497a6f6ef616ef4c3576c217d2a8a2c1ea5
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch')
| -rw-r--r-- | src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch b/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch deleted file mode 100644 index 396d1f7add..0000000000 --- a/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a1572a979803dda787be4a7095d5c37e926443a7 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" - -Native scripts do not appear in backtraces, or in the source and -line number when exceptions are thrown from within them. This is -useful to be able to write code in JavaScript instead of C++ and -still have it appear sensibly to the user. ---- - include/v8.h | 5 +++-- - src/compiler.cc | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/include/v8.h b/include/v8.h -index 6baf2b2..229ddbd 100644 ---- a/include/v8.h -+++ b/include/v8.h -@@ -588,8 +588,9 @@ class ScriptOrigin { - class V8EXPORT Script { - public: - enum CompileFlags { -- Default = 0x00, -- QmlMode = 0x01 -+ Default = 0x00, -+ QmlMode = 0x01, -+ NativeMode = 0x02 - }; - - /** -diff --git a/src/compiler.cc b/src/compiler.cc -index 596df4a..b760b71 100644 ---- a/src/compiler.cc -+++ b/src/compiler.cc -@@ -501,7 +501,7 @@ Handle<SharedFunctionInfo> Compiler::Compile(Handle<String> source, - - // Create a script object describing the script to be compiled. - Handle<Script> script = FACTORY->NewScript(source); -- if (natives == NATIVES_CODE) { -+ if (natives == NATIVES_CODE || compile_flags & v8::Script::NativeMode) { - script->set_type(Smi::FromInt(Script::TYPE_NATIVE)); - } - if (!script_name.is_null()) { --- -1.7.4.4 - |