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

Side by Side Diff: src/x64/code-stubs-x64.cc

Issue 131323003: Fix invalid debug code assertion on x64. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 11 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 | 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 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 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 4256 matching lines...) Expand 10 before | Expand all | Expand 10 after
4267 Isolate* isolate = masm->isolate(); 4267 Isolate* isolate = masm->isolate();
4268 4268
4269 // Load rcx with the allocation site. We stick an undefined dummy value here 4269 // Load rcx with the allocation site. We stick an undefined dummy value here
4270 // and replace it with the real allocation site later when we instantiate this 4270 // and replace it with the real allocation site later when we instantiate this
4271 // stub in BinaryOpICWithAllocationSiteStub::GetCodeCopyFromTemplate(). 4271 // stub in BinaryOpICWithAllocationSiteStub::GetCodeCopyFromTemplate().
4272 __ Move(rcx, handle(isolate->heap()->undefined_value())); 4272 __ Move(rcx, handle(isolate->heap()->undefined_value()));
4273 4273
4274 // Make sure that we actually patched the allocation site. 4274 // Make sure that we actually patched the allocation site.
4275 if (FLAG_debug_code) { 4275 if (FLAG_debug_code) {
4276 __ testb(rcx, Immediate(kSmiTagMask)); 4276 __ testb(rcx, Immediate(kSmiTagMask));
4277 __ Assert(zero, kExpectedAllocationSite); 4277 __ Assert(not_equal, kExpectedAllocationSite);
4278 __ Cmp(FieldOperand(rcx, HeapObject::kMapOffset), 4278 __ Cmp(FieldOperand(rcx, HeapObject::kMapOffset),
4279 isolate->factory()->allocation_site_map()); 4279 isolate->factory()->allocation_site_map());
4280 __ Assert(equal, kExpectedAllocationSite); 4280 __ Assert(equal, kExpectedAllocationSite);
4281 } 4281 }
4282 4282
4283 // Tail call into the stub that handles binary operations with allocation 4283 // Tail call into the stub that handles binary operations with allocation
4284 // sites. 4284 // sites.
4285 BinaryOpWithAllocationSiteStub stub(state_); 4285 BinaryOpWithAllocationSiteStub stub(state_);
4286 __ TailCallStub(&stub); 4286 __ TailCallStub(&stub);
4287 } 4287 }
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
5533 __ bind(&fast_elements_case); 5533 __ bind(&fast_elements_case);
5534 GenerateCase(masm, FAST_ELEMENTS); 5534 GenerateCase(masm, FAST_ELEMENTS);
5535 } 5535 }
5536 5536
5537 5537
5538 #undef __ 5538 #undef __
5539 5539
5540 } } // namespace v8::internal 5540 } } // namespace v8::internal
5541 5541
5542 #endif // V8_TARGET_ARCH_X64 5542 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698