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

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

Issue 8769008: Revert r10118 from bleeding edge. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years 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/x64/lithium-codegen-x64.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 2185 matching lines...) Expand 10 before | Expand all | Expand 10 after
2196 set_deoptimization_environment(result->environment()); 2196 set_deoptimization_environment(result->environment());
2197 ClearInstructionPendingDeoptimizationEnvironment(); 2197 ClearInstructionPendingDeoptimizationEnvironment();
2198 return result; 2198 return result;
2199 } 2199 }
2200 2200
2201 return NULL; 2201 return NULL;
2202 } 2202 }
2203 2203
2204 2204
2205 LInstruction* LChunkBuilder::DoStackCheck(HStackCheck* instr) { 2205 LInstruction* LChunkBuilder::DoStackCheck(HStackCheck* instr) {
2206 return AssignEnvironment(AssignPointerMap(new LStackCheck)); 2206 if (instr->is_function_entry()) {
2207 return MarkAsCall(new LStackCheck, instr);
2208 } else {
2209 ASSERT(instr->is_backwards_branch());
2210 return AssignEnvironment(AssignPointerMap(new LStackCheck));
2211 }
2207 } 2212 }
2208 2213
2209 2214
2210 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { 2215 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) {
2211 HEnvironment* outer = current_block_->last_environment(); 2216 HEnvironment* outer = current_block_->last_environment();
2212 HConstant* undefined = graph()->GetConstantUndefined(); 2217 HConstant* undefined = graph()->GetConstantUndefined();
2213 HEnvironment* inner = outer->CopyForInlining(instr->closure(), 2218 HEnvironment* inner = outer->CopyForInlining(instr->closure(),
2214 instr->function(), 2219 instr->function(),
2215 undefined, 2220 undefined,
2216 instr->call_kind()); 2221 instr->call_kind());
(...skipping 14 matching lines...) Expand all
2231 LOperand* key = UseOrConstantAtStart(instr->key()); 2236 LOperand* key = UseOrConstantAtStart(instr->key());
2232 LOperand* object = UseOrConstantAtStart(instr->object()); 2237 LOperand* object = UseOrConstantAtStart(instr->object());
2233 LIn* result = new LIn(key, object); 2238 LIn* result = new LIn(key, object);
2234 return MarkAsCall(DefineFixed(result, rax), instr); 2239 return MarkAsCall(DefineFixed(result, rax), instr);
2235 } 2240 }
2236 2241
2237 2242
2238 } } // namespace v8::internal 2243 } } // namespace v8::internal
2239 2244
2240 #endif // V8_TARGET_ARCH_X64 2245 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/lithium-codegen-x64.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698