Commit 97d842fa authored by sgjesse@chromium.org's avatar sgjesse@chromium.org

Fix issues with commit r3839

Fix broken condition.
Fixe some style issues.
Re-enabel part of a test which was turned off.

TBR=ager@chromium.org
Review URL: http://codereview.chromium.org/647007

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3894 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent ecf4b9fc
...@@ -4829,7 +4829,7 @@ bool SharedFunctionInfo::CanGenerateInlineConstructor(Object* prototype) { ...@@ -4829,7 +4829,7 @@ bool SharedFunctionInfo::CanGenerateInlineConstructor(Object* prototype) {
// Check the basic conditions for generating inline constructor code. // Check the basic conditions for generating inline constructor code.
if (!FLAG_inline_new if (!FLAG_inline_new
|| !has_only_simple_this_property_assignments() || !has_only_simple_this_property_assignments()
|| !this_property_assignments_count() > 0) { || this_property_assignments_count() == 0) {
return false; return false;
} }
...@@ -4840,7 +4840,7 @@ bool SharedFunctionInfo::CanGenerateInlineConstructor(Object* prototype) { ...@@ -4840,7 +4840,7 @@ bool SharedFunctionInfo::CanGenerateInlineConstructor(Object* prototype) {
} }
// Traverse the proposed prototype chain looking for setters for properties of // Traverse the proposed prototype chain looking for setters for properties of
// the same names as are set by the inline constructor.. // the same names as are set by the inline constructor.
for (Object* obj = prototype; for (Object* obj = prototype;
obj != Heap::null_value(); obj != Heap::null_value();
obj = obj->GetPrototype()) { obj = obj->GetPrototype()) {
......
...@@ -9630,10 +9630,7 @@ THREADED_TEST(SetterOnConstructorPrototype) { ...@@ -9630,10 +9630,7 @@ THREADED_TEST(SetterOnConstructorPrototype) {
" this.x = 23" " this.x = 23"
"};" "};"
"C2.prototype = { };" "C2.prototype = { };"
"C2.prototype.__proto__ = P;" "C2.prototype.__proto__ = P;");
""
""
"");
v8::Local<v8::Script> script; v8::Local<v8::Script> script;
script = v8::Script::Compile(v8_str("new C1();")); script = v8::Script::Compile(v8_str("new C1();"));
...@@ -9682,10 +9679,7 @@ THREADED_TEST(InterceptorOnConstructorPrototype) { ...@@ -9682,10 +9679,7 @@ THREADED_TEST(InterceptorOnConstructorPrototype) {
" this.x = 23" " this.x = 23"
"};" "};"
"C2.prototype = { };" "C2.prototype = { };"
"C2.prototype.__proto__ = P;" "C2.prototype.__proto__ = P;");
""
""
"");
v8::Local<v8::Script> script; v8::Local<v8::Script> script;
script = v8::Script::Compile(v8_str("new C1();")); script = v8::Script::Compile(v8_str("new C1();"));
......
...@@ -108,4 +108,4 @@ function RunTest(ensure_fast_case) { ...@@ -108,4 +108,4 @@ function RunTest(ensure_fast_case) {
} }
RunTest(false); RunTest(false);
//RunTest(true); RunTest(true);
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