Index: test/cctest/test-api.cc |
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc |
index 91f37367dae9d0ec815cbd4738bc62484e1df80f..b90b84c092e0b28d2b958c50264145b1a4ea26a2 100644 |
--- a/test/cctest/test-api.cc |
+++ b/test/cctest/test-api.cc |
@@ -9999,6 +9999,52 @@ THREADED_TEST(Regress91517) { |
} |
+// Getting property names of an object with a hidden and inherited |
+// prototype should not duplicate the accessor properties inherited. |
+THREADED_TEST(Regress269562) { |
+ i::FLAG_allow_natives_syntax = true; |
+ LocalContext context; |
+ v8::HandleScope handle_scope(context->GetIsolate()); |
+ |
+ Local<v8::FunctionTemplate> t1 = |
+ v8::FunctionTemplate::New(context->GetIsolate()); |
+ t1->SetHiddenPrototype(true); |
+ |
+ Local<v8::ObjectTemplate> i1 = t1->InstanceTemplate(); |
+ i1->SetAccessor(v8_str("foo"), |
+ SimpleAccessorGetter, SimpleAccessorSetter); |
+ i1->SetAccessor(v8_str("bar"), |
+ SimpleAccessorGetter, SimpleAccessorSetter); |
+ i1->SetAccessor(v8_str("baz"), |
+ SimpleAccessorGetter, SimpleAccessorSetter); |
+ i1->Set(v8_str("n1"), v8_num(1)); |
+ i1->Set(v8_str("n2"), v8_num(2)); |
+ |
+ Local<v8::Object> o1 = t1->GetFunction()->NewInstance(); |
+ Local<v8::FunctionTemplate> t2 = |
+ v8::FunctionTemplate::New(context->GetIsolate()); |
+ t2->SetHiddenPrototype(true); |
+ |
+ // Inherit from t1 and mark prototype as hidden. |
+ t2->Inherit(t1); |
+ t2->InstanceTemplate()->Set(v8_str("mine"), v8_num(4)); |
+ |
+ Local<v8::Object> o2 = t2->GetFunction()->NewInstance(); |
+ CHECK(o2->SetPrototype(o1)); |
+ |
+ // Call the runtime version of GetLocalPropertyNames() on |
+ // the natively created object through JavaScript. |
+ context->Global()->Set(v8_str("obj"), o2); |
+ CompileRun("var names = %GetLocalPropertyNames(obj, true);"); |
+ |
+ ExpectInt32("names.length", 4); |
dcarney
2013/12/19 19:46:12
'names' should include 'n1' and 'n2' as they are i
sof
2013/12/22 08:39:55
Eh, right :) Thanks, updated the pass conditions a
|
+ ExpectTrue("names.indexOf(\"foo\") >= 0"); |
+ ExpectTrue("names.indexOf(\"bar\") >= 0"); |
+ ExpectTrue("names.indexOf(\"baz\") >= 0"); |
+ ExpectTrue("names.indexOf(\"mine\") >= 0"); |
+} |
+ |
+ |
THREADED_TEST(FunctionReadOnlyPrototype) { |
LocalContext context; |
v8::HandleScope handle_scope(context->GetIsolate()); |