Revision: 3376 Author: [email protected] Date: Mon Nov 30 00:07:20 2009 Log: Merge revisions r3372 - r3374 to trunk
This is on order to try out the changes related to http://crbug.com/23058 on trunk before merging them to the beta branch. Review URL: http://codereview.chromium.org/449010 http://code.google.com/p/v8/source/detail?r=3376 Modified: /trunk/include/v8.h /trunk/src/accessors.cc /trunk/src/api.cc /trunk/src/factory.cc /trunk/src/handles.cc /trunk/src/messages.js /trunk/src/objects-debug.cc /trunk/src/objects-inl.h /trunk/src/objects.h /trunk/src/version.cc /trunk/test/cctest/test-api.cc /trunk/test/cctest/test-debug.cc ======================================= --- /trunk/include/v8.h Wed Nov 18 06:12:51 2009 +++ /trunk/include/v8.h Mon Nov 30 00:07:20 2009 @@ -598,7 +598,7 @@ * with the debugger as this data object is only available through the * debugger API. */ - void SetData(Handle<Value> data); + void SetData(Handle<String> data); }; @@ -2634,7 +2634,7 @@ * with the debugger to provide additional information on the context through * the debugger API. */ - void SetData(Handle<Value> data); + void SetData(Handle<String> data); Local<Value> GetData(); /** ======================================= --- /trunk/src/accessors.cc Wed Nov 18 06:12:51 2009 +++ /trunk/src/accessors.cc Mon Nov 30 00:07:20 2009 @@ -315,14 +315,11 @@ HandleScope scope; Handle<Script> script(Script::cast(JSValue::cast(object)->value())); InitScriptLineEnds(script); - if (script->line_ends_js_array()->IsUndefined()) { - Handle<FixedArray> line_ends_fixed_array( - FixedArray::cast(script->line_ends_fixed_array())); - Handle<FixedArray> copy = Factory::CopyFixedArray(line_ends_fixed_array); - Handle<JSArray> js_array = Factory::NewJSArrayWithElements(copy); - script->set_line_ends_js_array(*js_array); - } - return script->line_ends_js_array(); + ASSERT(script->line_ends()->IsFixedArray()); + Handle<FixedArray> line_ends(FixedArray::cast(script->line_ends())); + Handle<FixedArray> copy = Factory::CopyFixedArray(line_ends); + Handle<JSArray> js_array = Factory::NewJSArrayWithElements(copy); + return *js_array; } ======================================= --- /trunk/src/api.cc Wed Nov 18 06:12:51 2009 +++ /trunk/src/api.cc Mon Nov 30 00:07:20 2009 @@ -451,7 +451,7 @@ } -void Context::SetData(v8::Handle<Value> data) { +void Context::SetData(v8::Handle<String> data) { if (IsDeadCheck("v8::Context::SetData()")) return; ENTER_V8; { @@ -1175,7 +1175,7 @@ } -void Script::SetData(v8::Handle<Value> data) { +void Script::SetData(v8::Handle<String> data) { ON_BAILOUT("v8::Script::SetData()", return); LOG_API("Script::SetData"); { ======================================= --- /trunk/src/factory.cc Wed Nov 18 06:12:51 2009 +++ /trunk/src/factory.cc Mon Nov 30 00:07:20 2009 @@ -188,8 +188,7 @@ script->set_type(Smi::FromInt(Script::TYPE_NORMAL)); script->set_compilation_type(Smi::FromInt(Script::COMPILATION_TYPE_HOST)); script->set_wrapper(*wrapper); - script->set_line_ends_fixed_array(Heap::undefined_value()); - script->set_line_ends_js_array(Heap::undefined_value()); + script->set_line_ends(Heap::undefined_value()); script->set_eval_from_function(Heap::undefined_value()); script->set_eval_from_instructions_offset(Smi::FromInt(0)); ======================================= --- /trunk/src/handles.cc Wed Nov 18 06:12:51 2009 +++ /trunk/src/handles.cc Mon Nov 30 00:07:20 2009 @@ -429,12 +429,12 @@ // Init line_ends array with code positions of line ends inside script // source. void InitScriptLineEnds(Handle<Script> script) { - if (!script->line_ends_fixed_array()->IsUndefined()) return; + if (!script->line_ends()->IsUndefined()) return; if (!script->source()->IsString()) { ASSERT(script->source()->IsUndefined()); - script->set_line_ends_fixed_array(*(Factory::NewFixedArray(0))); - ASSERT(script->line_ends_fixed_array()->IsFixedArray()); + script->set_line_ends(*(Factory::NewFixedArray(0))); + ASSERT(script->line_ends()->IsFixedArray()); return; } @@ -467,8 +467,8 @@ } ASSERT(array_index == line_count); - script->set_line_ends_fixed_array(*array); - ASSERT(script->line_ends_fixed_array()->IsFixedArray()); + script->set_line_ends(*array); + ASSERT(script->line_ends()->IsFixedArray()); } @@ -477,7 +477,7 @@ InitScriptLineEnds(script); AssertNoAllocation no_allocation; FixedArray* line_ends_array = - FixedArray::cast(script->line_ends_fixed_array()); + FixedArray::cast(script->line_ends()); const int line_ends_len = line_ends_array->length(); int line = -1; ======================================= --- /trunk/src/messages.js Wed Oct 7 02:00:33 2009 +++ /trunk/src/messages.js Mon Nov 30 00:07:20 2009 @@ -238,14 +238,15 @@ Script.prototype.lineFromPosition = function(position) { var lower = 0; var upper = this.lineCount() - 1; + var line_ends = this.line_ends; // We'll never find invalid positions so bail right away. - if (position > this.line_ends[upper]) { + if (position > line_ends[upper]) { return -1; } // This means we don't have to safe-guard indexing line_ends[i - 1]. - if (position <= this.line_ends[0]) { + if (position <= line_ends[0]) { return 0; } @@ -253,9 +254,9 @@ while (upper >= 1) { var i = (lower + upper) >> 1; - if (position > this.line_ends[i]) { + if (position > line_ends[i]) { lower = i + 1; - } else if (position <= this.line_ends[i - 1]) { + } else if (position <= line_ends[i - 1]) { upper = i - 1; } else { return i; @@ -278,8 +279,9 @@ if (line == -1) return null; // Determine start, end and column. - var start = line == 0 ? 0 : this.line_ends[line - 1] + 1; - var end = this.line_ends[line]; + var line_ends = this.line_ends; + var start = line == 0 ? 0 : line_ends[line - 1] + 1; + var end = line_ends[line]; if (end > 0 && StringCharAt.call(this.source, end - 1) == '\r') end--; var column = position - start; @@ -368,8 +370,9 @@ return null; } - var from_position = from_line == 0 ? 0 : this.line_ends[from_line - 1] + 1; - var to_position = to_line == 0 ? 0 : this.line_ends[to_line - 1] + 1; + var line_ends = this.line_ends; + var from_position = from_line == 0 ? 0 : line_ends[from_line - 1] + 1; + var to_position = to_line == 0 ? 0 : line_ends[to_line - 1] + 1; // Return a source slice with line numbers re-adjusted to the resource. return new SourceSlice(this, from_line + this.line_offset, to_line + this.line_offset, @@ -391,8 +394,9 @@ } // Return the source line. - var start = line == 0 ? 0 : this.line_ends[line - 1] + 1; - var end = this.line_ends[line]; + var line_ends = this.line_ends; + var start = line == 0 ? 0 : line_ends[line - 1] + 1; + var end = line_ends[line]; return StringSubstring.call(this.source, start, end); } ======================================= --- /trunk/src/objects-debug.cc Wed Nov 18 06:12:51 2009 +++ /trunk/src/objects-debug.cc Mon Nov 30 00:07:20 2009 @@ -1140,8 +1140,7 @@ VerifyPointer(data()); VerifyPointer(wrapper()); type()->SmiVerify(); - VerifyPointer(line_ends_fixed_array()); - VerifyPointer(line_ends_js_array()); + VerifyPointer(line_ends()); VerifyPointer(id()); } @@ -1160,6 +1159,20 @@ type()->ShortPrint(); PrintF("\n - id: "); id()->ShortPrint(); + PrintF("\n - data: "); + data()->ShortPrint(); + PrintF("\n - context data: "); + context_data()->ShortPrint(); + PrintF("\n - wrapper: "); + wrapper()->ShortPrint(); + PrintF("\n - compilation type: "); + compilation_type()->ShortPrint(); + PrintF("\n - line ends: "); + line_ends()->ShortPrint(); + PrintF("\n - eval from function: "); + eval_from_function()->ShortPrint(); + PrintF("\n - eval from instructions offset: "); + eval_from_instructions_offset()->ShortPrint(); PrintF("\n"); } ======================================= --- /trunk/src/objects-inl.h Fri Nov 20 04:14:52 2009 +++ /trunk/src/objects-inl.h Mon Nov 30 00:07:20 2009 @@ -2441,8 +2441,7 @@ ACCESSORS(Script, wrapper, Proxy, kWrapperOffset) ACCESSORS(Script, type, Smi, kTypeOffset) ACCESSORS(Script, compilation_type, Smi, kCompilationTypeOffset) -ACCESSORS(Script, line_ends_fixed_array, Object, kLineEndsFixedArrayOffset) -ACCESSORS(Script, line_ends_js_array, Object, kLineEndsJSArrayOffset) +ACCESSORS(Script, line_ends, Object, kLineEndsOffset) ACCESSORS(Script, eval_from_function, Object, kEvalFromFunctionOffset) ACCESSORS(Script, eval_from_instructions_offset, Smi, kEvalFrominstructionsOffsetOffset) ======================================= --- /trunk/src/objects.h Fri Nov 20 04:14:52 2009 +++ /trunk/src/objects.h Mon Nov 30 00:07:20 2009 @@ -3182,10 +3182,7 @@ DECL_ACCESSORS(compilation_type, Smi) // [line_ends]: FixedArray of line ends positions. - DECL_ACCESSORS(line_ends_fixed_array, Object) - - // [line_ends]: JSArray of line ends positions. - DECL_ACCESSORS(line_ends_js_array, Object) + DECL_ACCESSORS(line_ends, Object) // [eval_from_function]: for eval scripts the funcion from which eval was // called. @@ -3215,16 +3212,8 @@ static const int kWrapperOffset = kContextOffset + kPointerSize; static const int kTypeOffset = kWrapperOffset + kPointerSize; static const int kCompilationTypeOffset = kTypeOffset + kPointerSize; - // We have the line ends array both in FixedArray form and in JSArray form. - // The FixedArray form is useful when we don't have a context and so can't - // create a JSArray. The JSArray form is useful when we want to see the - // array from JS code (e.g. debug-delay.js) which cannot handle unboxed - // FixedArray objects. - static const int kLineEndsFixedArrayOffset = - kCompilationTypeOffset + kPointerSize; - static const int kLineEndsJSArrayOffset = - kLineEndsFixedArrayOffset + kPointerSize; - static const int kIdOffset = kLineEndsJSArrayOffset + kPointerSize; + static const int kLineEndsOffset = kCompilationTypeOffset + kPointerSize; + static const int kIdOffset = kLineEndsOffset + kPointerSize; static const int kEvalFromFunctionOffset = kIdOffset + kPointerSize; static const int kEvalFrominstructionsOffsetOffset = kEvalFromFunctionOffset + kPointerSize; ======================================= --- /trunk/src/version.cc Tue Nov 24 06:29:16 2009 +++ /trunk/src/version.cc Mon Nov 30 00:07:20 2009 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 0 #define BUILD_NUMBER 2 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the ======================================= --- /trunk/test/cctest/test-api.cc Wed Nov 18 06:12:51 2009 +++ /trunk/test/cctest/test-api.cc Mon Nov 30 00:07:20 2009 @@ -8409,3 +8409,89 @@ v8::String::Utf8Value value(try_catch.Exception()); CHECK_EQ(0, strcmp(*value, "Hey!")); } + + +static int GetGlobalObjectsCount() { + int count = 0; + v8::internal::HeapIterator it; + while (it.has_next()) { + v8::internal::HeapObject* object = it.next(); + if (object->IsJSGlobalObject()) { + count++; + } + } +#ifdef DEBUG + if (count > 0) v8::internal::Heap::TracePathToGlobal(); +#endif + return count; +} + + +TEST(Bug528) { + v8::V8::Initialize(); + + v8::HandleScope scope; + v8::Persistent<Context> context; + int gc_count; + + // Context-dependent context data creates reference from the compilation + // cache to the global object. + context = Context::New(); + { + v8::HandleScope scope; + + context->Enter(); + Local<v8::String> obj = v8::String::New(""); + context->SetData(obj); + CompileRun("1"); + context->Exit(); + } + context.Dispose(); + for (gc_count = 1; gc_count < 10; gc_count++) { + v8::internal::Heap::CollectAllGarbage(false); + if (GetGlobalObjectsCount() == 0) break; + } + CHECK_EQ(0, GetGlobalObjectsCount()); + CHECK_EQ(2, gc_count); + + // Eval in a function creates reference from the compilation cache to the + // global object. + context = Context::New(); + { + v8::HandleScope scope; + + context->Enter(); + CompileRun("function f(){eval('1')}; f()"); + context->Exit(); + } + context.Dispose(); + for (gc_count = 1; gc_count < 10; gc_count++) { + v8::internal::Heap::CollectAllGarbage(false); + if (GetGlobalObjectsCount() == 0) break; + } + CHECK_EQ(0, GetGlobalObjectsCount()); + CHECK_EQ(2, gc_count); + + // Looking up the line number for an exception creates reference from the + // compilation cache to the global object. + context = Context::New(); + { + v8::HandleScope scope; + + context->Enter(); + v8::TryCatch try_catch; + CompileRun("function f(){throw 1;}; f()"); + CHECK(try_catch.HasCaught()); + v8::Handle<v8::Message> message = try_catch.Message(); + CHECK(!message.IsEmpty()); + CHECK_EQ(1, message->GetLineNumber()); + context->Exit(); + } + context.Dispose(); + for (gc_count = 1; gc_count < 10; gc_count++) { + v8::internal::Heap::CollectAllGarbage(false); + if (GetGlobalObjectsCount() == 0) break; + } + CHECK_EQ(0, GetGlobalObjectsCount()); + CHECK_EQ(2, gc_count); +} ======================================= --- /trunk/test/cctest/test-debug.cc Wed Nov 18 06:12:51 2009 +++ /trunk/test/cctest/test-debug.cc Mon Nov 30 00:07:20 2009 @@ -5016,7 +5016,7 @@ v8::ScriptOrigin origin2 = v8::ScriptOrigin(v8::String::New("new name")); v8::Handle<v8::Script> script2 = v8::Script::Compile(script, &origin2); script2->Run(); - script2->SetData(data_obj); + script2->SetData(data_obj->ToString()); f = v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("f"))); f->Call(env->Global(), 0, NULL); CHECK_EQ(3, break_point_hit_count); @@ -5069,8 +5069,8 @@ CHECK(context_2->GetData()->IsUndefined()); // Set and check different data values. - v8::Handle<v8::Value> data_1 = v8::Number::New(1); - v8::Handle<v8::Value> data_2 = v8::String::New("2"); + v8::Handle<v8::String> data_1 = v8::String::New("1"); + v8::Handle<v8::String> data_2 = v8::String::New("2"); context_1->SetData(data_1); context_2->SetData(data_2); CHECK(context_1->GetData()->StrictEquals(data_1)); @@ -5233,7 +5233,7 @@ CHECK(context_1->GetData()->IsUndefined()); // Set and check a data value. - v8::Handle<v8::Value> data_1 = v8::Number::New(1); + v8::Handle<v8::String> data_1 = v8::String::New("1"); context_1->SetData(data_1); CHECK(context_1->GetData()->StrictEquals(data_1)); -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
