From: mvstanton@chromium.org Date: Fri, 26 Apr 2013 08:49:20 +0000 (+0000) Subject: Fix test/build failures (win64 compile warning, isolate test parallel compilation... X-Git-Tag: upstream/4.7.83~14423 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adb450bc44bcd2d6e43eccebd3d66e18d1ea7601;p=platform%2Fupstream%2Fv8.git Fix test/build failures (win64 compile warning, isolate test parallel compilation failure, gcmole issue, isolate test intermittant failure) BUG= Review URL: https://codereview.chromium.org/14265024 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14449 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc index e386036..f81d240 100644 --- a/src/bootstrapper.cc +++ b/src/bootstrapper.cc @@ -890,15 +890,15 @@ bool Genesis::InitializeGlobal(Handle inner_global, // overwritten by JS code. native_context()->set_array_function(*array_function); - // Cache the array maps - MaybeObject* cache_result = CacheInitialJSArrayMaps(*native_context(), - *initial_map); - if (cache_result->IsFailure()) return false; - if (FLAG_optimize_constructed_arrays) { + // Cache the array maps, needed by ArrayConstructorStub + MaybeObject* cache_result = CacheInitialJSArrayMaps(*native_context(), + *initial_map); + if (cache_result->IsFailure()) return false; + ArrayConstructorStub array_constructor_stub(isolate); - array_function->shared()->set_construct_stub( - *array_constructor_stub.GetCode(isolate)); + Handle code = array_constructor_stub.GetCode(isolate); + array_function->shared()->set_construct_stub(*code); } else { array_function->shared()->set_construct_stub( isolate->builtins()->builtin(Builtins::kCommonArrayConstructCode)); diff --git a/src/heap.cc b/src/heap.cc index 018c3d8..b9b14e8 100644 --- a/src/heap.cc +++ b/src/heap.cc @@ -163,7 +163,8 @@ Heap::Heap() #endif promotion_queue_(this), configured_(false), - chunks_queued_for_free_(NULL) { + chunks_queued_for_free_(NULL), + relocation_mutex_(NULL) { // Allow build-time customization of the max semispace size. Building // V8 with snapshots and a non-default max semispace size is much // easier if you can define it as part of the build environment. diff --git a/src/hydrogen.cc b/src/hydrogen.cc index d74db8e..5c135b7 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -1860,7 +1860,7 @@ HValue* HGraphBuilder::JSArrayBuilder::EmitMapCode(HValue* context) { HGlobalObject(context)); HInstruction* native_context = AddInstruction(new(zone()) HLoadNamedField(global_object, true, GlobalObject::kNativeContextOffset)); - size_t offset = Context::kHeaderSize + + int offset = Context::kHeaderSize + kPointerSize * Context::JS_ARRAY_MAPS_INDEX; HInstruction* map_array = AddInstruction(new(zone()) HLoadNamedField(native_context, true, offset));