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

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

Issue 6731089: Fix the bug in the bug fix. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 8 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 | « no previous file | no next file » | 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 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 isolate->stub_cache()->CollectMatchingMaps(types, *name, flags); 350 isolate->stub_cache()->CollectMatchingMaps(types, *name, flags);
351 return types->length() > 0 ? types : NULL; 351 return types->length() > 0 ? types : NULL;
352 } else { 352 } else {
353 return NULL; 353 return NULL;
354 } 354 }
355 } 355 }
356 356
357 357
358 void TypeFeedbackOracle::SetInfo(int position, Object* target) { 358 void TypeFeedbackOracle::SetInfo(int position, Object* target) {
359 MaybeObject* maybe_result = dictionary_->AtNumberPut(position, target); 359 MaybeObject* maybe_result = dictionary_->AtNumberPut(position, target);
360 USE(maybe_result);
361 #ifdef DEBUG
360 Object* result; 362 Object* result;
361 USE(maybe_result);
362 USE(result);
363 // Dictionary has been allocated with sufficient size for all elements. 363 // Dictionary has been allocated with sufficient size for all elements.
364 ASSERT(maybe_result->ToObject(&result)); 364 ASSERT(maybe_result->ToObject(&result));
365 ASSERT(*dictionary_ == result); 365 ASSERT(*dictionary_ == result);
366 #endif
366 } 367 }
367 368
368 369
369 void TypeFeedbackOracle::PopulateMap(Handle<Code> code) { 370 void TypeFeedbackOracle::PopulateMap(Handle<Code> code) {
370 Isolate* isolate = Isolate::Current(); 371 Isolate* isolate = Isolate::Current();
371 HandleScope scope(isolate); 372 HandleScope scope(isolate);
372 373
373 const int kInitialCapacity = 16; 374 const int kInitialCapacity = 16;
374 List<int> code_positions(kInitialCapacity); 375 List<int> code_positions(kInitialCapacity);
375 List<int> source_positions(kInitialCapacity); 376 List<int> source_positions(kInitialCapacity);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 source_positions->Add(position); 463 source_positions->Add(position);
463 } 464 }
464 } else { 465 } else {
465 ASSERT(RelocInfo::IsPosition(mode)); 466 ASSERT(RelocInfo::IsPosition(mode));
466 position = static_cast<int>(info->data()); 467 position = static_cast<int>(info->data());
467 } 468 }
468 } 469 }
469 } 470 }
470 471
471 } } // namespace v8::internal 472 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698