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

Side by Side Diff: src/type-info.cc

Issue 6532091: Merge bleeding_edge revision (5922, 5934] to isolates branch.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/isolates/
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/runtime-profiler.cc ('k') | src/version.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 2010 the V8 project authors. All rights reserved. 1 // Copyright 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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 TRBinaryOpIC::GENERIC) { 332 TRBinaryOpIC::GENERIC) {
333 continue; 333 continue;
334 } 334 }
335 } else if (kind == Code::COMPARE_IC) { 335 } else if (kind == Code::COMPARE_IC) {
336 if (target->compare_state() == CompareIC::GENERIC) continue; 336 if (target->compare_state() == CompareIC::GENERIC) continue;
337 } else { 337 } else {
338 if (kind == Code::CALL_IC && state == MONOMORPHIC && 338 if (kind == Code::CALL_IC && state == MONOMORPHIC &&
339 target->check_type() != RECEIVER_MAP_CHECK) continue; 339 target->check_type() != RECEIVER_MAP_CHECK) continue;
340 if (state != MONOMORPHIC && state != MEGAMORPHIC) continue; 340 if (state != MONOMORPHIC && state != MEGAMORPHIC) continue;
341 } 341 }
342 code_positions->Add(info->pc() - code->instruction_start()); 342 code_positions->Add(
343 static_cast<int>(info->pc() - code->instruction_start()));
343 source_positions->Add(position); 344 source_positions->Add(position);
344 } 345 }
345 } else { 346 } else {
346 ASSERT(RelocInfo::IsPosition(mode)); 347 ASSERT(RelocInfo::IsPosition(mode));
347 position = info->data(); 348 position = static_cast<int>(info->data());
348 } 349 }
349 } 350 }
350 } 351 }
351 352
352 } } // namespace v8::internal 353 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/runtime-profiler.cc ('k') | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698