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

Side by Side Diff: src/runtime.cc

Issue 8135003: Fix verification of weak maps during initialization. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 2 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-printer.cc ('k') | 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 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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 weakmap->set_next(Smi::FromInt(0)); 709 weakmap->set_next(Smi::FromInt(0));
710 return *weakmap; 710 return *weakmap;
711 } 711 }
712 712
713 713
714 RUNTIME_FUNCTION(MaybeObject*, Runtime_WeakMapGet) { 714 RUNTIME_FUNCTION(MaybeObject*, Runtime_WeakMapGet) {
715 NoHandleAllocation ha; 715 NoHandleAllocation ha;
716 ASSERT(args.length() == 2); 716 ASSERT(args.length() == 2);
717 CONVERT_ARG_CHECKED(JSWeakMap, weakmap, 0); 717 CONVERT_ARG_CHECKED(JSWeakMap, weakmap, 0);
718 CONVERT_ARG_CHECKED(JSReceiver, key, 1); 718 CONVERT_ARG_CHECKED(JSReceiver, key, 1);
719 return weakmap->table()->Lookup(*key); 719 return ObjectHashTable::cast(weakmap->table())->Lookup(*key);
720 } 720 }
721 721
722 722
723 RUNTIME_FUNCTION(MaybeObject*, Runtime_WeakMapSet) { 723 RUNTIME_FUNCTION(MaybeObject*, Runtime_WeakMapSet) {
724 HandleScope scope(isolate); 724 HandleScope scope(isolate);
725 ASSERT(args.length() == 3); 725 ASSERT(args.length() == 3);
726 CONVERT_ARG_CHECKED(JSWeakMap, weakmap, 0); 726 CONVERT_ARG_CHECKED(JSWeakMap, weakmap, 0);
727 CONVERT_ARG_CHECKED(JSReceiver, key, 1); 727 CONVERT_ARG_CHECKED(JSReceiver, key, 1);
728 Handle<Object> value(args[2]); 728 Handle<Object> value(args[2]);
729 Handle<ObjectHashTable> table(weakmap->table()); 729 Handle<ObjectHashTable> table(ObjectHashTable::cast(weakmap->table()));
730 Handle<ObjectHashTable> new_table = PutIntoObjectHashTable(table, key, value); 730 Handle<ObjectHashTable> new_table = PutIntoObjectHashTable(table, key, value);
731 weakmap->set_table(*new_table); 731 weakmap->set_table(*new_table);
732 return *value; 732 return *value;
733 } 733 }
734 734
735 735
736 RUNTIME_FUNCTION(MaybeObject*, Runtime_ClassOf) { 736 RUNTIME_FUNCTION(MaybeObject*, Runtime_ClassOf) {
737 NoHandleAllocation ha; 737 NoHandleAllocation ha;
738 ASSERT(args.length() == 1); 738 ASSERT(args.length() == 1);
739 Object* obj = args[0]; 739 Object* obj = args[0];
(...skipping 12508 matching lines...) Expand 10 before | Expand all | Expand 10 after
13248 } else { 13248 } else {
13249 // Handle last resort GC and make sure to allow future allocations 13249 // Handle last resort GC and make sure to allow future allocations
13250 // to grow the heap without causing GCs (if possible). 13250 // to grow the heap without causing GCs (if possible).
13251 isolate->counters()->gc_last_resort_from_js()->Increment(); 13251 isolate->counters()->gc_last_resort_from_js()->Increment();
13252 isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags); 13252 isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags);
13253 } 13253 }
13254 } 13254 }
13255 13255
13256 13256
13257 } } // namespace v8::internal 13257 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/objects-printer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698