Reviewers: Mads Ager, iposva, Message: I'm applying Ivan's r1978 to the 1.1 branch.
I'm going to commit this to cut a new Google Chrome 172 build. (If it needs to be changed, I'll re-apply and cut a new build.) Description: Apply r1978 to the 1.1 branch. - Fix handling when compiling count operations. NOTE: I didn't include the #if debug block move, since it doesn't seem relevant to the Chrome 172 release. BUG= http://crbug.com/12054 TBR= iposva,ager Please review this at http://codereview.chromium.org/115439 SVN Base: http://v8.googlecode.com/svn/branches/1.1/ Affected files: M ChangeLog M src/api.cc M src/codegen-ia32.cc Index: src/codegen-ia32.cc =================================================================== --- src/codegen-ia32.cc (revision 1980) +++ src/codegen-ia32.cc (working copy) @@ -4856,9 +4856,9 @@ // successfully allocate a temporary byte register. if (tmp.is_valid()) { __ setcc(overflow, tmp.reg()); - __ or_(Operand(value.reg()), tmp.reg()); + __ or_(Operand(tmp.reg()), value.reg()); + __ test(tmp.reg(), Immediate(kSmiTagMask)); tmp.Unuse(); - __ test(value.reg(), Immediate(kSmiTagMask)); deferred->enter()->Branch(not_zero, &value, not_taken); } else { // Otherwise we test separately for overflow and smi check. deferred->enter()->Branch(overflow, &value, not_taken); Index: ChangeLog =================================================================== --- ChangeLog (revision 1980) +++ ChangeLog (working copy) @@ -1,3 +1,8 @@ +2009-05-15: Version 1.1.10.12 + + Fix http://crbug.com/12054. Fix numeric overflow handling when compiling + count operations in CodeGenerator::VisitCountOperation. + 2009-04-15: Version 1.1.10 Fixed crash bug that occurred when loading a const variable in the Index: src/api.cc =================================================================== --- src/api.cc (revision 1980) +++ src/api.cc (working copy) @@ -2373,7 +2373,7 @@ const char* v8::V8::GetVersion() { - return "1.1.10.11"; + return "1.1.10.12"; } --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
