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

Side by Side Diff: src/heap.cc

Issue 6709026: [Isolates] Small fixes after the last merge. (Closed)
Patch Set: Created 9 years, 9 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
« no previous file with comments | « src/global-handles.cc ('k') | src/mark-compact.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 2884 matching lines...) Expand 10 before | Expand all | Expand 10 after
2895 JSObject* boilerplate; 2895 JSObject* boilerplate;
2896 int arguments_object_size; 2896 int arguments_object_size;
2897 bool strict_mode_callee = callee->IsJSFunction() && 2897 bool strict_mode_callee = callee->IsJSFunction() &&
2898 JSFunction::cast(callee)->shared()->strict_mode(); 2898 JSFunction::cast(callee)->shared()->strict_mode();
2899 if (strict_mode_callee) { 2899 if (strict_mode_callee) {
2900 boilerplate = 2900 boilerplate =
2901 isolate()->context()->global_context()-> 2901 isolate()->context()->global_context()->
2902 strict_mode_arguments_boilerplate(); 2902 strict_mode_arguments_boilerplate();
2903 arguments_object_size = kArgumentsObjectSizeStrict; 2903 arguments_object_size = kArgumentsObjectSizeStrict;
2904 } else { 2904 } else {
2905 boilerplate = 2905 boilerplate =
2906 isolate()->context()->global_context()->arguments_boilerplate(); 2906 isolate()->context()->global_context()->arguments_boilerplate();
2907 arguments_object_size = kArgumentsObjectSize; 2907 arguments_object_size = kArgumentsObjectSize;
2908 } 2908 }
2909 2909
2910 // This calls Copy directly rather than using Heap::AllocateRaw so we 2910 // This calls Copy directly rather than using Heap::AllocateRaw so we
2911 // duplicate the check here. 2911 // duplicate the check here.
2912 ASSERT(allocation_allowed_ && gc_state_ == NOT_IN_GC); 2912 ASSERT(allocation_allowed_ && gc_state_ == NOT_IN_GC);
2913 2913
2914 // Check that the size of the boilerplate matches our 2914 // Check that the size of the boilerplate matches our
2915 // expectations. The ArgumentsAccessStub::GenerateNewObject relies 2915 // expectations. The ArgumentsAccessStub::GenerateNewObject relies
(...skipping 2861 matching lines...) Expand 10 before | Expand all | Expand 10 after
5777 } 5777 }
5778 5778
5779 5779
5780 void ExternalStringTable::TearDown() { 5780 void ExternalStringTable::TearDown() {
5781 new_space_strings_.Free(); 5781 new_space_strings_.Free();
5782 old_space_strings_.Free(); 5782 old_space_strings_.Free();
5783 } 5783 }
5784 5784
5785 5785
5786 } } // namespace v8::internal 5786 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/global-handles.cc ('k') | src/mark-compact.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698