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

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

Issue 7348008: Merge up to 8597 to experimental/gc from the bleeding edge. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/
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 | « src/heap.cc ('k') | src/heap-profiler.h » ('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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 if (__maybe_object__->ToObject(&__object__)) RETURN_VALUE; \ 516 if (__maybe_object__->ToObject(&__object__)) RETURN_VALUE; \
517 if (__maybe_object__->IsOutOfMemory() || \ 517 if (__maybe_object__->IsOutOfMemory() || \
518 __maybe_object__->IsRetryAfterGC()) { \ 518 __maybe_object__->IsRetryAfterGC()) { \
519 /* TODO(1181417): Fix this. */ \ 519 /* TODO(1181417): Fix this. */ \
520 v8::internal::V8::FatalProcessOutOfMemory("CALL_AND_RETRY_2", true);\ 520 v8::internal::V8::FatalProcessOutOfMemory("CALL_AND_RETRY_2", true);\
521 } \ 521 } \
522 RETURN_EMPTY; \ 522 RETURN_EMPTY; \
523 } while (false) 523 } while (false)
524 524
525 525
526 // TODO(isolates): cache isolate: either accept as a parameter or
527 // set to some known symbol (__CUR_ISOLATE__?)
528 #define CALL_HEAP_FUNCTION(ISOLATE, FUNCTION_CALL, TYPE) \ 526 #define CALL_HEAP_FUNCTION(ISOLATE, FUNCTION_CALL, TYPE) \
529 CALL_AND_RETRY(ISOLATE, \ 527 CALL_AND_RETRY(ISOLATE, \
530 FUNCTION_CALL, \ 528 FUNCTION_CALL, \
531 return Handle<TYPE>(TYPE::cast(__object__), ISOLATE), \ 529 return Handle<TYPE>(TYPE::cast(__object__), ISOLATE), \
532 return Handle<TYPE>()) 530 return Handle<TYPE>())
533 531
534 532
535 #define CALL_HEAP_FUNCTION_VOID(ISOLATE, FUNCTION_CALL) \ 533 #define CALL_HEAP_FUNCTION_VOID(ISOLATE, FUNCTION_CALL) \
536 CALL_AND_RETRY(ISOLATE, FUNCTION_CALL, return, return) 534 CALL_AND_RETRY(ISOLATE, FUNCTION_CALL, return, return)
537 535
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 676
679 677
680 Heap* _inline_get_heap_() { 678 Heap* _inline_get_heap_() {
681 return HEAP; 679 return HEAP;
682 } 680 }
683 681
684 682
685 } } // namespace v8::internal 683 } } // namespace v8::internal
686 684
687 #endif // V8_HEAP_INL_H_ 685 #endif // V8_HEAP_INL_H_
OLDNEW
« no previous file with comments | « src/heap.cc ('k') | src/heap-profiler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698