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

Side by Side Diff: src/ia32/lithium-ia32.cc

Issue 6461022: Merge a number of assertion failure fixes to the 3.0 branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.0/
Patch Set: '' 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
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 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 MarkAsSaveDoubles(result); 1118 MarkAsSaveDoubles(result);
1119 return AssignEnvironment(AssignPointerMap(DefineFixed(result, eax))); 1119 return AssignEnvironment(AssignPointerMap(DefineFixed(result, eax)));
1120 } 1120 }
1121 1121
1122 1122
1123 LInstruction* LChunkBuilder::DoApplyArguments(HApplyArguments* instr) { 1123 LInstruction* LChunkBuilder::DoApplyArguments(HApplyArguments* instr) {
1124 LOperand* function = UseFixed(instr->function(), edi); 1124 LOperand* function = UseFixed(instr->function(), edi);
1125 LOperand* receiver = UseFixed(instr->receiver(), eax); 1125 LOperand* receiver = UseFixed(instr->receiver(), eax);
1126 LOperand* length = UseRegisterAtStart(instr->length()); 1126 LOperand* length = UseRegisterAtStart(instr->length());
1127 LOperand* elements = UseRegisterAtStart(instr->elements()); 1127 LOperand* elements = UseRegisterAtStart(instr->elements());
1128 LOperand* temp = FixedTemp(ebx);
1128 LApplyArguments* result = new LApplyArguments(function, 1129 LApplyArguments* result = new LApplyArguments(function,
1129 receiver, 1130 receiver,
1130 length, 1131 length,
1131 elements); 1132 elements,
1133 temp);
1132 return MarkAsCall(DefineFixed(result, eax), instr, CAN_DEOPTIMIZE_EAGERLY); 1134 return MarkAsCall(DefineFixed(result, eax), instr, CAN_DEOPTIMIZE_EAGERLY);
1133 } 1135 }
1134 1136
1135 1137
1136 LInstruction* LChunkBuilder::DoPushArgument(HPushArgument* instr) { 1138 LInstruction* LChunkBuilder::DoPushArgument(HPushArgument* instr) {
1137 ++argument_count_; 1139 ++argument_count_;
1138 LOperand* argument = UseOrConstant(instr->argument()); 1140 LOperand* argument = UseOrConstant(instr->argument());
1139 return new LPushArgument(argument); 1141 return new LPushArgument(argument);
1140 } 1142 }
1141 1143
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
1917 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { 1919 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) {
1918 HEnvironment* outer = current_block_->last_environment()->outer(); 1920 HEnvironment* outer = current_block_->last_environment()->outer();
1919 current_block_->UpdateEnvironment(outer); 1921 current_block_->UpdateEnvironment(outer);
1920 return NULL; 1922 return NULL;
1921 } 1923 }
1922 1924
1923 1925
1924 } } // namespace v8::internal 1926 } } // namespace v8::internal
1925 1927
1926 #endif // V8_TARGET_ARCH_IA32 1928 #endif // V8_TARGET_ARCH_IA32
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698