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/arm/lithium-codegen-arm.cc

Issue 7359013: Fix arm compilation failure on the 3.2 branch after merge of r8623 from bleeding edge. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.2/
Patch Set: Created 9 years, 5 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 | « no previous file | src/version.cc » ('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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 LInstruction* instr, 493 LInstruction* instr,
494 SafepointMode safepoint_mode) { 494 SafepointMode safepoint_mode) {
495 ASSERT(instr != NULL); 495 ASSERT(instr != NULL);
496 LPointerMap* pointers = instr->pointer_map(); 496 LPointerMap* pointers = instr->pointer_map();
497 RecordPosition(pointers->position()); 497 RecordPosition(pointers->position());
498 __ Call(code, mode); 498 __ Call(code, mode);
499 RegisterLazyDeoptimization(instr, safepoint_mode); 499 RegisterLazyDeoptimization(instr, safepoint_mode);
500 500
501 // Signal that we don't inline smi code before these stubs in the 501 // Signal that we don't inline smi code before these stubs in the
502 // optimizing code generator. 502 // optimizing code generator.
503 if (code->kind() == Code::BINARY_OP_IC || 503 if (code->kind() == Code::TYPE_RECORDING_BINARY_OP_IC ||
504 code->kind() == Code::COMPARE_IC) { 504 code->kind() == Code::COMPARE_IC) {
505 __ nop(); 505 __ nop();
506 } 506 }
507 } 507 }
508 508
509 509
510 void LCodeGen::CallRuntime(const Runtime::Function* function, 510 void LCodeGen::CallRuntime(const Runtime::Function* function,
511 int num_arguments, 511 int num_arguments,
512 LInstruction* instr) { 512 LInstruction* instr) {
513 ASSERT(instr != NULL); 513 ASSERT(instr != NULL);
(...skipping 3702 matching lines...) Expand 10 before | Expand all | Expand 10 after
4216 ASSERT(!environment->HasBeenRegistered()); 4216 ASSERT(!environment->HasBeenRegistered());
4217 RegisterEnvironmentForDeoptimization(environment); 4217 RegisterEnvironmentForDeoptimization(environment);
4218 ASSERT(osr_pc_offset_ == -1); 4218 ASSERT(osr_pc_offset_ == -1);
4219 osr_pc_offset_ = masm()->pc_offset(); 4219 osr_pc_offset_ = masm()->pc_offset();
4220 } 4220 }
4221 4221
4222 4222
4223 #undef __ 4223 #undef __
4224 4224
4225 } } // namespace v8::internal 4225 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698