Revision: 11827
Author: [email protected]
Date: Fri Jun 15 02:40:41 2012
Log: Merged r11813, r11826 into trunk branch.
Workaround for: Chrome dev tools crashes when taking a heap snapshot of
Docs offline shared worker.
Fix packed-element.js test on ARM with no snap
BUG=chromium:132727
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10545195
http://code.google.com/p/v8/source/detail?r=11827
Modified:
/trunk/src/arm/macro-assembler-arm.cc
/trunk/src/profile-generator.cc
/trunk/src/version.cc
=======================================
--- /trunk/src/arm/macro-assembler-arm.cc Wed Jun 13 04:51:58 2012
+++ /trunk/src/arm/macro-assembler-arm.cc Fri Jun 15 02:40:41 2012
@@ -2878,7 +2878,8 @@
Context::SlotOffset(Context::JS_ARRAY_MAPS_INDEX)));
size_t offset = expected_kind * kPointerSize +
FixedArrayBase::kHeaderSize;
- cmp(map_in_out, scratch);
+ ldr(ip, FieldMemOperand(scratch, offset));
+ cmp(map_in_out, ip);
b(ne, no_map_match);
// Use the transitioned cached map.
=======================================
--- /trunk/src/profile-generator.cc Wed Jun 13 04:51:58 2012
+++ /trunk/src/profile-generator.cc Fri Jun 15 02:40:41 2012
@@ -2692,6 +2692,10 @@
Object* obj_document;
if (global_obj->GetProperty(*document_string)->ToObject(&obj_document)
&&
obj_document->IsJSObject()) {
+ // FixMe: Workaround: SharedWorker's current Isolate has NULL
context.
+ // As result GetProperty(*url_string) will crash.
+ if (!Isolate::Current()->context() &&
obj_document->IsJSGlobalProxy())
+ continue;
JSObject* document = JSObject::cast(obj_document);
Object* obj_url;
if (document->GetProperty(*url_string)->ToObject(&obj_url) &&
=======================================
--- /trunk/src/version.cc Thu Jun 14 08:34:20 2012
+++ /trunk/src/version.cc Fri Jun 15 02:40:41 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 11
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 3
+#define PATCH_LEVEL 4
// 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
