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

Side by Side Diff: src/hydrogen-instructions.cc

Issue 110443003: Make it possible to assert that certain instance types are compatible wrt HAllocate. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Do not expose the flags. Created 7 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/hydrogen-instructions.h ('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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 3474 matching lines...) Expand 10 before | Expand all | Expand 10 after
3485 // TODO(hpayer): This is a short-term hack to make allocation mementos 3485 // TODO(hpayer): This is a short-term hack to make allocation mementos
3486 // work again in new space. 3486 // work again in new space.
3487 dominator_allocate->ClearNextMapWord(original_object_size); 3487 dominator_allocate->ClearNextMapWord(original_object_size);
3488 } 3488 }
3489 #else 3489 #else
3490 // TODO(hpayer): This is a short-term hack to make allocation mementos 3490 // TODO(hpayer): This is a short-term hack to make allocation mementos
3491 // work again in new space. 3491 // work again in new space.
3492 dominator_allocate->ClearNextMapWord(original_object_size); 3492 dominator_allocate->ClearNextMapWord(original_object_size);
3493 #endif 3493 #endif
3494 3494
3495 dominator_allocate->clear_next_map_word_ = clear_next_map_word_; 3495 dominator_allocate->UpdateClearNextMapWord(MustClearNextMapWord());
3496 3496
3497 // After that replace the dominated allocate instruction. 3497 // After that replace the dominated allocate instruction.
3498 HInstruction* dominated_allocate_instr = 3498 HInstruction* dominated_allocate_instr =
3499 HInnerAllocatedObject::New(zone, 3499 HInnerAllocatedObject::New(zone,
3500 context(), 3500 context(),
3501 dominator_allocate, 3501 dominator_allocate,
3502 dominator_size, 3502 dominator_size,
3503 type()); 3503 type());
3504 dominated_allocate_instr->InsertBefore(this); 3504 dominated_allocate_instr->InsertBefore(this);
3505 DeleteAndReplaceWith(dominated_allocate_instr); 3505 DeleteAndReplaceWith(dominated_allocate_instr);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
3621 Representation::Smi()); 3621 Representation::Smi());
3622 HStoreNamedField* store_size = HStoreNamedField::New(zone, context(), 3622 HStoreNamedField* store_size = HStoreNamedField::New(zone, context(),
3623 free_space_instr, access, filler_size); 3623 free_space_instr, access, filler_size);
3624 store_size->SetFlag(HValue::kHasNoObservableSideEffects); 3624 store_size->SetFlag(HValue::kHasNoObservableSideEffects);
3625 store_size->InsertAfter(filler_size); 3625 store_size->InsertAfter(filler_size);
3626 filler_free_space_size_ = store_size; 3626 filler_free_space_size_ = store_size;
3627 } 3627 }
3628 3628
3629 3629
3630 void HAllocate::ClearNextMapWord(int offset) { 3630 void HAllocate::ClearNextMapWord(int offset) {
3631 if (clear_next_map_word_) { 3631 if (MustClearNextMapWord()) {
3632 Zone* zone = block()->zone(); 3632 Zone* zone = block()->zone();
3633 HObjectAccess access = HObjectAccess::ForJSObjectOffset(offset); 3633 HObjectAccess access = HObjectAccess::ForJSObjectOffset(offset);
3634 HStoreNamedField* clear_next_map = 3634 HStoreNamedField* clear_next_map =
3635 HStoreNamedField::New(zone, context(), this, access, 3635 HStoreNamedField::New(zone, context(), this, access,
3636 block()->graph()->GetConstantNull()); 3636 block()->graph()->GetConstantNull());
3637 clear_next_map->ClearAllSideEffects(); 3637 clear_next_map->ClearAllSideEffects();
3638 clear_next_map->InsertAfter(this); 3638 clear_next_map->InsertAfter(this);
3639 } 3639 }
3640 } 3640 }
3641 3641
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
4422 break; 4422 break;
4423 case kExternalMemory: 4423 case kExternalMemory:
4424 stream->Add("[external-memory]"); 4424 stream->Add("[external-memory]");
4425 break; 4425 break;
4426 } 4426 }
4427 4427
4428 stream->Add("@%d", offset()); 4428 stream->Add("@%d", offset());
4429 } 4429 }
4430 4430
4431 } } // namespace v8::internal 4431 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/hydrogen-instructions.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698