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

Side by Side Diff: src/heap.cc

Issue 201573007: Revert "Remove Failure::OutOfMemory propagation and V8::IgnoreOutOfMemoryException." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 9 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/execution.cc ('k') | src/heap-inl.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 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 3853 matching lines...) Expand 10 before | Expand all | Expand 10 after
3864 message->set_script(script); 3864 message->set_script(script);
3865 message->set_stack_frames(stack_frames); 3865 message->set_stack_frames(stack_frames);
3866 return result; 3866 return result;
3867 } 3867 }
3868 3868
3869 3869
3870 MaybeObject* Heap::AllocateExternalStringFromAscii( 3870 MaybeObject* Heap::AllocateExternalStringFromAscii(
3871 const ExternalAsciiString::Resource* resource) { 3871 const ExternalAsciiString::Resource* resource) {
3872 size_t length = resource->length(); 3872 size_t length = resource->length();
3873 if (length > static_cast<size_t>(String::kMaxLength)) { 3873 if (length > static_cast<size_t>(String::kMaxLength)) {
3874 v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true); 3874 isolate()->context()->mark_out_of_memory();
3875 return Failure::OutOfMemoryException(0x5);
3875 } 3876 }
3876 3877
3877 Map* map = external_ascii_string_map(); 3878 Map* map = external_ascii_string_map();
3878 Object* result; 3879 Object* result;
3879 { MaybeObject* maybe_result = Allocate(map, NEW_SPACE); 3880 { MaybeObject* maybe_result = Allocate(map, NEW_SPACE);
3880 if (!maybe_result->ToObject(&result)) return maybe_result; 3881 if (!maybe_result->ToObject(&result)) return maybe_result;
3881 } 3882 }
3882 3883
3883 ExternalAsciiString* external_string = ExternalAsciiString::cast(result); 3884 ExternalAsciiString* external_string = ExternalAsciiString::cast(result);
3884 external_string->set_length(static_cast<int>(length)); 3885 external_string->set_length(static_cast<int>(length));
3885 external_string->set_hash_field(String::kEmptyHashField); 3886 external_string->set_hash_field(String::kEmptyHashField);
3886 external_string->set_resource(resource); 3887 external_string->set_resource(resource);
3887 3888
3888 return result; 3889 return result;
3889 } 3890 }
3890 3891
3891 3892
3892 MaybeObject* Heap::AllocateExternalStringFromTwoByte( 3893 MaybeObject* Heap::AllocateExternalStringFromTwoByte(
3893 const ExternalTwoByteString::Resource* resource) { 3894 const ExternalTwoByteString::Resource* resource) {
3894 size_t length = resource->length(); 3895 size_t length = resource->length();
3895 if (length > static_cast<size_t>(String::kMaxLength)) { 3896 if (length > static_cast<size_t>(String::kMaxLength)) {
3896 v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true); 3897 isolate()->context()->mark_out_of_memory();
3898 return Failure::OutOfMemoryException(0x6);
3897 } 3899 }
3898 3900
3899 // For small strings we check whether the resource contains only 3901 // For small strings we check whether the resource contains only
3900 // one byte characters. If yes, we use a different string map. 3902 // one byte characters. If yes, we use a different string map.
3901 static const size_t kOneByteCheckLengthLimit = 32; 3903 static const size_t kOneByteCheckLengthLimit = 32;
3902 bool is_one_byte = length <= kOneByteCheckLengthLimit && 3904 bool is_one_byte = length <= kOneByteCheckLengthLimit &&
3903 String::IsOneByte(resource->data(), static_cast<int>(length)); 3905 String::IsOneByte(resource->data(), static_cast<int>(length));
3904 Map* map = is_one_byte ? 3906 Map* map = is_one_byte ?
3905 external_string_with_one_byte_data_map() : external_string_map(); 3907 external_string_with_one_byte_data_map() : external_string_map();
3906 Object* result; 3908 Object* result;
(...skipping 30 matching lines...) Expand all
3937 { MaybeObject* maybe_result = AllocateRawTwoByteString(1); 3939 { MaybeObject* maybe_result = AllocateRawTwoByteString(1);
3938 if (!maybe_result->To<SeqTwoByteString>(&result)) return maybe_result; 3940 if (!maybe_result->To<SeqTwoByteString>(&result)) return maybe_result;
3939 } 3941 }
3940 result->SeqTwoByteStringSet(0, code); 3942 result->SeqTwoByteStringSet(0, code);
3941 return result; 3943 return result;
3942 } 3944 }
3943 3945
3944 3946
3945 MaybeObject* Heap::AllocateByteArray(int length, PretenureFlag pretenure) { 3947 MaybeObject* Heap::AllocateByteArray(int length, PretenureFlag pretenure) {
3946 if (length < 0 || length > ByteArray::kMaxLength) { 3948 if (length < 0 || length > ByteArray::kMaxLength) {
3947 v8::internal::Heap::FatalProcessOutOfMemory("invalid array length", true); 3949 return Failure::OutOfMemoryException(0x7);
3948 } 3950 }
3949 int size = ByteArray::SizeFor(length); 3951 int size = ByteArray::SizeFor(length);
3950 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure); 3952 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure);
3951 Object* result; 3953 Object* result;
3952 { MaybeObject* maybe_result = AllocateRaw(size, space, OLD_DATA_SPACE); 3954 { MaybeObject* maybe_result = AllocateRaw(size, space, OLD_DATA_SPACE);
3953 if (!maybe_result->ToObject(&result)) return maybe_result; 3955 if (!maybe_result->ToObject(&result)) return maybe_result;
3954 } 3956 }
3955 3957
3956 reinterpret_cast<ByteArray*>(result)->set_map_no_write_barrier( 3958 reinterpret_cast<ByteArray*>(result)->set_map_no_write_barrier(
3957 byte_array_map()); 3959 byte_array_map());
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
4972 4974
4973 template<bool is_one_byte, typename T> 4975 template<bool is_one_byte, typename T>
4974 MaybeObject* Heap::AllocateInternalizedStringImpl( 4976 MaybeObject* Heap::AllocateInternalizedStringImpl(
4975 T t, int chars, uint32_t hash_field) { 4977 T t, int chars, uint32_t hash_field) {
4976 ASSERT(chars >= 0); 4978 ASSERT(chars >= 0);
4977 // Compute map and object size. 4979 // Compute map and object size.
4978 int size; 4980 int size;
4979 Map* map; 4981 Map* map;
4980 4982
4981 if (chars > String::kMaxLength) { 4983 if (chars > String::kMaxLength) {
4982 v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true); 4984 return Failure::OutOfMemoryException(0x9);
4983 } 4985 }
4984 if (is_one_byte) { 4986 if (is_one_byte) {
4985 map = ascii_internalized_string_map(); 4987 map = ascii_internalized_string_map();
4986 size = SeqOneByteString::SizeFor(chars); 4988 size = SeqOneByteString::SizeFor(chars);
4987 } else { 4989 } else {
4988 map = internalized_string_map(); 4990 map = internalized_string_map();
4989 size = SeqTwoByteString::SizeFor(chars); 4991 size = SeqTwoByteString::SizeFor(chars);
4990 } 4992 }
4991 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, TENURED); 4993 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, TENURED);
4992 4994
(...skipping 27 matching lines...) Expand all
5020 MaybeObject* Heap::AllocateInternalizedStringImpl<false>( 5022 MaybeObject* Heap::AllocateInternalizedStringImpl<false>(
5021 String*, int, uint32_t); 5023 String*, int, uint32_t);
5022 template 5024 template
5023 MaybeObject* Heap::AllocateInternalizedStringImpl<false>( 5025 MaybeObject* Heap::AllocateInternalizedStringImpl<false>(
5024 Vector<const char>, int, uint32_t); 5026 Vector<const char>, int, uint32_t);
5025 5027
5026 5028
5027 MaybeObject* Heap::AllocateRawOneByteString(int length, 5029 MaybeObject* Heap::AllocateRawOneByteString(int length,
5028 PretenureFlag pretenure) { 5030 PretenureFlag pretenure) {
5029 if (length < 0 || length > String::kMaxLength) { 5031 if (length < 0 || length > String::kMaxLength) {
5030 v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true); 5032 return Failure::OutOfMemoryException(0xb);
5031 } 5033 }
5032 int size = SeqOneByteString::SizeFor(length); 5034 int size = SeqOneByteString::SizeFor(length);
5033 ASSERT(size <= SeqOneByteString::kMaxSize); 5035 ASSERT(size <= SeqOneByteString::kMaxSize);
5034 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure); 5036 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure);
5035 5037
5036 Object* result; 5038 Object* result;
5037 { MaybeObject* maybe_result = AllocateRaw(size, space, OLD_DATA_SPACE); 5039 { MaybeObject* maybe_result = AllocateRaw(size, space, OLD_DATA_SPACE);
5038 if (!maybe_result->ToObject(&result)) return maybe_result; 5040 if (!maybe_result->ToObject(&result)) return maybe_result;
5039 } 5041 }
5040 5042
5041 // Partially initialize the object. 5043 // Partially initialize the object.
5042 HeapObject::cast(result)->set_map_no_write_barrier(ascii_string_map()); 5044 HeapObject::cast(result)->set_map_no_write_barrier(ascii_string_map());
5043 String::cast(result)->set_length(length); 5045 String::cast(result)->set_length(length);
5044 String::cast(result)->set_hash_field(String::kEmptyHashField); 5046 String::cast(result)->set_hash_field(String::kEmptyHashField);
5045 ASSERT_EQ(size, HeapObject::cast(result)->Size()); 5047 ASSERT_EQ(size, HeapObject::cast(result)->Size());
5046 5048
5047 return result; 5049 return result;
5048 } 5050 }
5049 5051
5050 5052
5051 MaybeObject* Heap::AllocateRawTwoByteString(int length, 5053 MaybeObject* Heap::AllocateRawTwoByteString(int length,
5052 PretenureFlag pretenure) { 5054 PretenureFlag pretenure) {
5053 if (length < 0 || length > String::kMaxLength) { 5055 if (length < 0 || length > String::kMaxLength) {
5054 v8::internal::Heap::FatalProcessOutOfMemory("invalid string length", true); 5056 return Failure::OutOfMemoryException(0xc);
5055 } 5057 }
5056 int size = SeqTwoByteString::SizeFor(length); 5058 int size = SeqTwoByteString::SizeFor(length);
5057 ASSERT(size <= SeqTwoByteString::kMaxSize); 5059 ASSERT(size <= SeqTwoByteString::kMaxSize);
5058 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure); 5060 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure);
5059 5061
5060 Object* result; 5062 Object* result;
5061 { MaybeObject* maybe_result = AllocateRaw(size, space, OLD_DATA_SPACE); 5063 { MaybeObject* maybe_result = AllocateRaw(size, space, OLD_DATA_SPACE);
5062 if (!maybe_result->ToObject(&result)) return maybe_result; 5064 if (!maybe_result->ToObject(&result)) return maybe_result;
5063 } 5065 }
5064 5066
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
5192 CopyBlock( 5194 CopyBlock(
5193 dst->address() + ConstantPoolArray::kLengthOffset, 5195 dst->address() + ConstantPoolArray::kLengthOffset,
5194 src->address() + ConstantPoolArray::kLengthOffset, 5196 src->address() + ConstantPoolArray::kLengthOffset,
5195 size - ConstantPoolArray::kLengthOffset); 5197 size - ConstantPoolArray::kLengthOffset);
5196 return obj; 5198 return obj;
5197 } 5199 }
5198 5200
5199 5201
5200 MaybeObject* Heap::AllocateRawFixedArray(int length, PretenureFlag pretenure) { 5202 MaybeObject* Heap::AllocateRawFixedArray(int length, PretenureFlag pretenure) {
5201 if (length < 0 || length > FixedArray::kMaxLength) { 5203 if (length < 0 || length > FixedArray::kMaxLength) {
5202 v8::internal::Heap::FatalProcessOutOfMemory("invalid array length", true); 5204 return Failure::OutOfMemoryException(0xe);
5203 } 5205 }
5204 int size = FixedArray::SizeFor(length); 5206 int size = FixedArray::SizeFor(length);
5205 AllocationSpace space = SelectSpace(size, OLD_POINTER_SPACE, pretenure); 5207 AllocationSpace space = SelectSpace(size, OLD_POINTER_SPACE, pretenure);
5206 5208
5207 return AllocateRaw(size, space, OLD_POINTER_SPACE); 5209 return AllocateRaw(size, space, OLD_POINTER_SPACE);
5208 } 5210 }
5209 5211
5210 5212
5211 MaybeObject* Heap::AllocateFixedArrayWithFiller(int length, 5213 MaybeObject* Heap::AllocateFixedArrayWithFiller(int length,
5212 PretenureFlag pretenure, 5214 PretenureFlag pretenure,
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
5304 5306
5305 elements->set_map_no_write_barrier(fixed_double_array_map()); 5307 elements->set_map_no_write_barrier(fixed_double_array_map());
5306 elements->set_length(length); 5308 elements->set_length(length);
5307 return elements; 5309 return elements;
5308 } 5310 }
5309 5311
5310 5312
5311 MaybeObject* Heap::AllocateRawFixedDoubleArray(int length, 5313 MaybeObject* Heap::AllocateRawFixedDoubleArray(int length,
5312 PretenureFlag pretenure) { 5314 PretenureFlag pretenure) {
5313 if (length < 0 || length > FixedDoubleArray::kMaxLength) { 5315 if (length < 0 || length > FixedDoubleArray::kMaxLength) {
5314 v8::internal::Heap::FatalProcessOutOfMemory("invalid array length", true); 5316 return Failure::OutOfMemoryException(0xf);
5315 } 5317 }
5316 int size = FixedDoubleArray::SizeFor(length); 5318 int size = FixedDoubleArray::SizeFor(length);
5317 #ifndef V8_HOST_ARCH_64_BIT 5319 #ifndef V8_HOST_ARCH_64_BIT
5318 size += kPointerSize; 5320 size += kPointerSize;
5319 #endif 5321 #endif
5320 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure); 5322 AllocationSpace space = SelectSpace(size, OLD_DATA_SPACE, pretenure);
5321 5323
5322 HeapObject* object; 5324 HeapObject* object;
5323 { MaybeObject* maybe_object = AllocateRaw(size, space, OLD_DATA_SPACE); 5325 { MaybeObject* maybe_object = AllocateRaw(size, space, OLD_DATA_SPACE);
5324 if (!maybe_object->To<HeapObject>(&object)) return maybe_object; 5326 if (!maybe_object->To<HeapObject>(&object)) return maybe_object;
(...skipping 2482 matching lines...) Expand 10 before | Expand all | Expand 10 after
7807 static_cast<int>(object_sizes_last_time_[index])); 7809 static_cast<int>(object_sizes_last_time_[index]));
7808 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT) 7810 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT)
7809 #undef ADJUST_LAST_TIME_OBJECT_COUNT 7811 #undef ADJUST_LAST_TIME_OBJECT_COUNT
7810 7812
7811 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); 7813 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_));
7812 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); 7814 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_));
7813 ClearObjectStats(); 7815 ClearObjectStats();
7814 } 7816 }
7815 7817
7816 } } // namespace v8::internal 7818 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/execution.cc ('k') | src/heap-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698