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

Side by Side Diff: src/bootstrapper.cc

Issue 150168: Removed virtual behavior from Dictionaries. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 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 | « no previous file | src/code-stubs.cc » ('j') | src/objects.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 break; 1427 break;
1428 case NORMAL: 1428 case NORMAL:
1429 // Do not occur since the from object has fast properties. 1429 // Do not occur since the from object has fast properties.
1430 case INTERCEPTOR: 1430 case INTERCEPTOR:
1431 // No element in instance descriptors have interceptor type. 1431 // No element in instance descriptors have interceptor type.
1432 UNREACHABLE(); 1432 UNREACHABLE();
1433 break; 1433 break;
1434 } 1434 }
1435 } 1435 }
1436 } else { 1436 } else {
1437 Handle<Dictionary> properties = 1437 Handle<StringDictionary> properties =
1438 Handle<Dictionary>(from->property_dictionary()); 1438 Handle<StringDictionary>(from->property_dictionary());
1439 int capacity = properties->Capacity(); 1439 int capacity = properties->Capacity();
1440 for (int i = 0; i < capacity; i++) { 1440 for (int i = 0; i < capacity; i++) {
1441 Object* raw_key(properties->KeyAt(i)); 1441 Object* raw_key(properties->KeyAt(i));
1442 if (properties->IsKey(raw_key)) { 1442 if (properties->IsKey(raw_key)) {
1443 ASSERT(raw_key->IsString()); 1443 ASSERT(raw_key->IsString());
1444 // If the property is already there we skip it. 1444 // If the property is already there we skip it.
1445 LookupResult result; 1445 LookupResult result;
1446 to->LocalLookup(String::cast(raw_key), &result); 1446 to->LocalLookup(String::cast(raw_key), &result);
1447 if (result.IsValid()) continue; 1447 if (result.IsValid()) continue;
1448 // Set the property. 1448 // Set the property.
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 } 1619 }
1620 1620
1621 1621
1622 // Restore statics that are thread local. 1622 // Restore statics that are thread local.
1623 char* Genesis::RestoreState(char* from) { 1623 char* Genesis::RestoreState(char* from) {
1624 current_ = *reinterpret_cast<Genesis**>(from); 1624 current_ = *reinterpret_cast<Genesis**>(from);
1625 return from + sizeof(current_); 1625 return from + sizeof(current_);
1626 } 1626 }
1627 1627
1628 } } // namespace v8::internal 1628 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/code-stubs.cc » ('j') | src/objects.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698