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

Side by Side Diff: src/heap.cc

Issue 133693002: Merged r18307 into 3.23 branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.23
Patch Set: merge r18309 too 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 | « src/code-stubs.cc ('k') | src/objects.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 4241 matching lines...) Expand 10 before | Expand all | Expand 10 after
4252 } 4252 }
4253 4253
4254 // Initialize the object 4254 // Initialize the object
4255 result->set_map_no_write_barrier(code_map()); 4255 result->set_map_no_write_barrier(code_map());
4256 Code* code = Code::cast(result); 4256 Code* code = Code::cast(result);
4257 ASSERT(!isolate_->code_range()->exists() || 4257 ASSERT(!isolate_->code_range()->exists() ||
4258 isolate_->code_range()->contains(code->address())); 4258 isolate_->code_range()->contains(code->address()));
4259 code->set_instruction_size(desc.instr_size); 4259 code->set_instruction_size(desc.instr_size);
4260 code->set_relocation_info(reloc_info); 4260 code->set_relocation_info(reloc_info);
4261 code->set_flags(flags); 4261 code->set_flags(flags);
4262 code->set_raw_kind_specific_flags1(0);
4263 code->set_raw_kind_specific_flags2(0);
4262 if (code->is_call_stub() || code->is_keyed_call_stub()) { 4264 if (code->is_call_stub() || code->is_keyed_call_stub()) {
4263 code->set_check_type(RECEIVER_MAP_CHECK); 4265 code->set_check_type(RECEIVER_MAP_CHECK);
4264 } 4266 }
4265 code->set_is_crankshafted(crankshafted); 4267 code->set_is_crankshafted(crankshafted);
4266 code->set_deoptimization_data(empty_fixed_array(), SKIP_WRITE_BARRIER); 4268 code->set_deoptimization_data(empty_fixed_array(), SKIP_WRITE_BARRIER);
4267 code->set_raw_type_feedback_info(undefined_value()); 4269 code->set_raw_type_feedback_info(undefined_value());
4268 code->set_handler_table(empty_fixed_array(), SKIP_WRITE_BARRIER); 4270 code->set_handler_table(empty_fixed_array(), SKIP_WRITE_BARRIER);
4269 code->set_gc_metadata(Smi::FromInt(0)); 4271 code->set_gc_metadata(Smi::FromInt(0));
4270 code->set_ic_age(global_ic_age_); 4272 code->set_ic_age(global_ic_age_);
4271 code->set_prologue_offset(prologue_offset); 4273 code->set_prologue_offset(prologue_offset);
(...skipping 3716 matching lines...) Expand 10 before | Expand all | Expand 10 after
7988 static_cast<int>(object_sizes_last_time_[index])); 7990 static_cast<int>(object_sizes_last_time_[index]));
7989 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT) 7991 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT)
7990 #undef ADJUST_LAST_TIME_OBJECT_COUNT 7992 #undef ADJUST_LAST_TIME_OBJECT_COUNT
7991 7993
7992 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); 7994 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_));
7993 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); 7995 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_));
7994 ClearObjectStats(); 7996 ClearObjectStats();
7995 } 7997 }
7996 7998
7997 } } // namespace v8::internal 7999 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/code-stubs.cc ('k') | src/objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698