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

Side by Side Diff: src/objects.cc

Issue 7064029: Migrate flags from bit_field2 to bit_field3 (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: just migrate a single flag Created 9 years, 7 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/objects.h ('k') | src/objects-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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 2517 matching lines...) Expand 10 before | Expand all | Expand 10 after
2528 slow->SharedMapVerify(); 2528 slow->SharedMapVerify();
2529 #endif 2529 #endif
2530 return 2530 return
2531 slow->constructor() == fast->constructor() && 2531 slow->constructor() == fast->constructor() &&
2532 slow->prototype() == fast->prototype() && 2532 slow->prototype() == fast->prototype() &&
2533 slow->inobject_properties() == ((mode == CLEAR_INOBJECT_PROPERTIES) ? 2533 slow->inobject_properties() == ((mode == CLEAR_INOBJECT_PROPERTIES) ?
2534 0 : 2534 0 :
2535 fast->inobject_properties()) && 2535 fast->inobject_properties()) &&
2536 slow->instance_type() == fast->instance_type() && 2536 slow->instance_type() == fast->instance_type() &&
2537 slow->bit_field() == fast->bit_field() && 2537 slow->bit_field() == fast->bit_field() &&
2538 slow->bit_field3() == fast->bit_field3() && 2538 slow->bit_field2() == fast->bit_field2() &&
2539 (slow->bit_field2() & ~(1<<Map::kIsShared)) == fast->bit_field2(); 2539 (slow->bit_field3() & ~(1<<Map::kIsShared)) == fast->bit_field3();
2540 } 2540 }
2541 2541
2542 2542
2543 MaybeObject* JSObject::UpdateMapCodeCache(String* name, Code* code) { 2543 MaybeObject* JSObject::UpdateMapCodeCache(String* name, Code* code) {
2544 if (map()->is_shared()) { 2544 if (map()->is_shared()) {
2545 // Fast case maps are never marked as shared. 2545 // Fast case maps are never marked as shared.
2546 ASSERT(!HasFastProperties()); 2546 ASSERT(!HasFastProperties());
2547 // Replace the map with an identical copy that can be safely modified. 2547 // Replace the map with an identical copy that can be safely modified.
2548 Object* obj; 2548 Object* obj;
2549 { MaybeObject* maybe_obj = map()->CopyNormalized(KEEP_INOBJECT_PROPERTIES, 2549 { MaybeObject* maybe_obj = map()->CopyNormalized(KEEP_INOBJECT_PROPERTIES,
(...skipping 8026 matching lines...) Expand 10 before | Expand all | Expand 10 after
10576 if (break_point_objects()->IsUndefined()) return 0; 10576 if (break_point_objects()->IsUndefined()) return 0;
10577 // Single beak point. 10577 // Single beak point.
10578 if (!break_point_objects()->IsFixedArray()) return 1; 10578 if (!break_point_objects()->IsFixedArray()) return 1;
10579 // Multiple break points. 10579 // Multiple break points.
10580 return FixedArray::cast(break_point_objects())->length(); 10580 return FixedArray::cast(break_point_objects())->length();
10581 } 10581 }
10582 #endif 10582 #endif
10583 10583
10584 10584
10585 } } // namespace v8::internal 10585 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/objects.h ('k') | src/objects-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698