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

Side by Side Diff: src/heap-inl.h

Issue 6529032: Merge 6168:6800 from bleeding_edge to experimental/gc branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/
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
« no previous file with comments | « src/heap.cc ('k') | src/heap-profiler.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 2006-2010 the V8 project authors. All rights reserved. 1 // Copyright 2006-2010 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 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 #define CALL_HEAP_FUNCTION(FUNCTION_CALL, TYPE) \ 507 #define CALL_HEAP_FUNCTION(FUNCTION_CALL, TYPE) \
508 CALL_AND_RETRY(FUNCTION_CALL, \ 508 CALL_AND_RETRY(FUNCTION_CALL, \
509 return Handle<TYPE>(TYPE::cast(__object__)), \ 509 return Handle<TYPE>(TYPE::cast(__object__)), \
510 return Handle<TYPE>()) 510 return Handle<TYPE>())
511 511
512 512
513 #define CALL_HEAP_FUNCTION_VOID(FUNCTION_CALL) \ 513 #define CALL_HEAP_FUNCTION_VOID(FUNCTION_CALL) \
514 CALL_AND_RETRY(FUNCTION_CALL, return, return) 514 CALL_AND_RETRY(FUNCTION_CALL, return, return)
515 515
516 516
517 #define CALL_HEAP_FUNCTION_INLINE(FUNCTION_CALL) \
518 CALL_AND_RETRY(FUNCTION_CALL, break, break)
519
520
521 #ifdef DEBUG 517 #ifdef DEBUG
522 518
523 inline bool Heap::allow_allocation(bool new_state) { 519 inline bool Heap::allow_allocation(bool new_state) {
524 bool old = allocation_allowed_; 520 bool old = allocation_allowed_;
525 allocation_allowed_ = new_state; 521 allocation_allowed_ = new_state;
526 return old; 522 return old;
527 } 523 }
528 524
529 #endif 525 #endif
530 526
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 571
576 572
577 void ExternalStringTable::ShrinkNewStrings(int position) { 573 void ExternalStringTable::ShrinkNewStrings(int position) {
578 new_space_strings_.Rewind(position); 574 new_space_strings_.Rewind(position);
579 Verify(); 575 Verify();
580 } 576 }
581 577
582 } } // namespace v8::internal 578 } } // namespace v8::internal
583 579
584 #endif // V8_HEAP_INL_H_ 580 #endif // V8_HEAP_INL_H_
OLDNEW
« no previous file with comments | « src/heap.cc ('k') | src/heap-profiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698