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

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

Issue 7063022: Merge r8028 to the 3.2 branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.2
Patch Set: Created 9 years, 7 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/version.cc ('k') | no next file » | 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 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1391 result_saved = true; 1391 result_saved = true;
1392 } 1392 }
1393 switch (property->kind()) { 1393 switch (property->kind()) {
1394 case ObjectLiteral::Property::CONSTANT: 1394 case ObjectLiteral::Property::CONSTANT:
1395 UNREACHABLE(); 1395 UNREACHABLE();
1396 case ObjectLiteral::Property::MATERIALIZED_LITERAL: 1396 case ObjectLiteral::Property::MATERIALIZED_LITERAL:
1397 ASSERT(!CompileTimeValue::IsCompileTimeValue(value)); 1397 ASSERT(!CompileTimeValue::IsCompileTimeValue(value));
1398 // Fall through. 1398 // Fall through.
1399 case ObjectLiteral::Property::COMPUTED: 1399 case ObjectLiteral::Property::COMPUTED:
1400 if (key->handle()->IsSymbol()) { 1400 if (key->handle()->IsSymbol()) {
1401 VisitForAccumulatorValue(value);
1402 __ Move(rcx, key->handle());
1403 __ movq(rdx, Operand(rsp, 0));
1404 if (property->emit_store()) { 1401 if (property->emit_store()) {
1405 Handle<Code> ic = isolate()->builtins()->StoreIC_Initialize(); 1402 VisitForAccumulatorValue(value);
1403 __ Move(rcx, key->handle());
1404 __ movq(rdx, Operand(rsp, 0));
1405 Handle<Code> ic = is_strict_mode()
1406 ? isolate()->builtins()->StoreIC_Initialize_Strict()
1407 : isolate()->builtins()->StoreIC_Initialize();
1406 EmitCallIC(ic, RelocInfo::CODE_TARGET); 1408 EmitCallIC(ic, RelocInfo::CODE_TARGET);
1407 PrepareForBailoutForId(key->id(), NO_REGISTERS); 1409 PrepareForBailoutForId(key->id(), NO_REGISTERS);
1410 } else {
1411 VisitForEffect(value);
1408 } 1412 }
1409 break; 1413 break;
1410 } 1414 }
1411 // Fall through. 1415 // Fall through.
1412 case ObjectLiteral::Property::PROTOTYPE: 1416 case ObjectLiteral::Property::PROTOTYPE:
1413 __ push(Operand(rsp, 0)); // Duplicate receiver. 1417 __ push(Operand(rsp, 0)); // Duplicate receiver.
1414 VisitForStackValue(key); 1418 VisitForStackValue(key);
1415 VisitForStackValue(value); 1419 VisitForStackValue(value);
1416 if (property->emit_store()) { 1420 if (property->emit_store()) {
1417 __ Push(Smi::FromInt(NONE)); // PropertyAttributes 1421 __ Push(Smi::FromInt(NONE)); // PropertyAttributes
(...skipping 2912 matching lines...) Expand 10 before | Expand all | Expand 10 after
4330 __ ret(0); 4334 __ ret(0);
4331 } 4335 }
4332 4336
4333 4337
4334 #undef __ 4338 #undef __
4335 4339
4336 4340
4337 } } // namespace v8::internal 4341 } } // namespace v8::internal
4338 4342
4339 #endif // V8_TARGET_ARCH_X64 4343 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/version.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698