Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: src/x64/full-codegen-x64.cc

Issue 6475009: Fix a duplicate AST ID recorded for for/in. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Uploaded x64 and ARM versions. Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/ia32/full-codegen-ia32.cc ('k') | test/mjsunit/regress/regress-1149.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after
1679 VisitForAccumulatorValue(prop->obj()); 1679 VisitForAccumulatorValue(prop->obj());
1680 __ movq(rdx, rax); 1680 __ movq(rdx, rax);
1681 __ pop(rax); // Restore value. 1681 __ pop(rax); // Restore value.
1682 __ Move(rcx, prop->key()->AsLiteral()->handle()); 1682 __ Move(rcx, prop->key()->AsLiteral()->handle());
1683 Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Initialize)); 1683 Handle<Code> ic(Builtins::builtin(Builtins::StoreIC_Initialize));
1684 EmitCallIC(ic, RelocInfo::CODE_TARGET); 1684 EmitCallIC(ic, RelocInfo::CODE_TARGET);
1685 break; 1685 break;
1686 } 1686 }
1687 case KEYED_PROPERTY: { 1687 case KEYED_PROPERTY: {
1688 __ push(rax); // Preserve value. 1688 __ push(rax); // Preserve value.
1689 VisitForStackValue(prop->obj()); 1689 if (prop->is_synthetic()) {
1690 VisitForAccumulatorValue(prop->key()); 1690 ASSERT(prop->obj()->AsVariableProxy() != NULL);
1691 __ movq(rcx, rax); 1691 ASSERT(prop->key()->AsLiteral() != NULL);
1692 __ pop(rdx); 1692 { AccumulatorValueContext for_object(this);
1693 __ pop(rax); 1693 EmitVariableLoad(prop->obj()->AsVariableProxy()->var());
1694 }
1695 __ movq(rdx, rax);
1696 __ Move(rcx, prop->key()->AsLiteral()->handle());
1697 } else {
1698 VisitForStackValue(prop->obj());
1699 VisitForAccumulatorValue(prop->key());
1700 __ movq(rcx, rax);
1701 __ pop(rdx);
1702 }
1703 __ pop(rax); // Restore value.
1694 Handle<Code> ic(Builtins::builtin(Builtins::KeyedStoreIC_Initialize)); 1704 Handle<Code> ic(Builtins::builtin(Builtins::KeyedStoreIC_Initialize));
1695 EmitCallIC(ic, RelocInfo::CODE_TARGET); 1705 EmitCallIC(ic, RelocInfo::CODE_TARGET);
1696 break; 1706 break;
1697 } 1707 }
1698 } 1708 }
1699 PrepareForBailoutForId(bailout_ast_id, TOS_REG); 1709 PrepareForBailoutForId(bailout_ast_id, TOS_REG);
1700 context()->Plug(rax); 1710 context()->Plug(rax);
1701 } 1711 }
1702 1712
1703 1713
(...skipping 2042 matching lines...) Expand 10 before | Expand all | Expand 10 after
3746 __ ret(0); 3756 __ ret(0);
3747 } 3757 }
3748 3758
3749 3759
3750 #undef __ 3760 #undef __
3751 3761
3752 3762
3753 } } // namespace v8::internal 3763 } } // namespace v8::internal
3754 3764
3755 #endif // V8_TARGET_ARCH_X64 3765 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/ia32/full-codegen-ia32.cc ('k') | test/mjsunit/regress/regress-1149.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698