Fixed issue 54, under some circumstances internal field count set on

object templates did not take effect.



git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@226 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent b3401cec
...@@ -979,6 +979,12 @@ void ObjectTemplate::SetInternalFieldCount(int value) { ...@@ -979,6 +979,12 @@ void ObjectTemplate::SetInternalFieldCount(int value) {
"Invalid internal field count")) { "Invalid internal field count")) {
return; return;
} }
if (value > 0) {
// The internal field count is set by the constructor function's
// construct code, so we ensure that there is a constructor
// function to do the setting.
EnsureConstructor(this);
}
Utils::OpenHandle(this)->set_internal_field_count(i::Smi::FromInt(value)); Utils::OpenHandle(this)->set_internal_field_count(i::Smi::FromInt(value));
} }
......
...@@ -4825,3 +4825,21 @@ THREADED_TEST(DisposeEnteredContext) { ...@@ -4825,3 +4825,21 @@ THREADED_TEST(DisposeEnteredContext) {
inner->Exit(); inner->Exit();
} }
} }
// Regression test for issue 54, object templates with internal fields
// but no accessors or interceptors did not get their internal field
// count set on instances.
THREADED_TEST(Regress54) {
v8::HandleScope outer;
LocalContext context;
static v8::Persistent<v8::ObjectTemplate> templ;
if (templ.IsEmpty()) {
v8::HandleScope inner;
v8::Handle<v8::ObjectTemplate> local = v8::ObjectTemplate::New();
local->SetInternalFieldCount(1);
templ = v8::Persistent<v8::ObjectTemplate>::New(inner.Close(local));
}
v8::Handle<v8::Object> result = templ->NewInstance();
CHECK_EQ(1, result->InternalFieldCount());
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment