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

Side by Side Diff: src/runtime.cc

Issue 435021: Fix compilation error in r3350 (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 1 month 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 2006-2009 the V8 project authors. All rights reserved. 1 // Copyright 2006-2009 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 3744 matching lines...) Expand 10 before | Expand all | Expand 10 after
3755 // NewNumberFromDouble may return a Smi instead of a Number object 3755 // NewNumberFromDouble may return a Smi instead of a Number object
3756 return Heap::NewNumberFromDouble(x); 3756 return Heap::NewNumberFromDouble(x);
3757 } 3757 }
3758 3758
3759 3759
3760 static Object* Runtime_StringAdd(Arguments args) { 3760 static Object* Runtime_StringAdd(Arguments args) {
3761 NoHandleAllocation ha; 3761 NoHandleAllocation ha;
3762 ASSERT(args.length() == 2); 3762 ASSERT(args.length() == 2);
3763 CONVERT_CHECKED(String, str1, args[0]); 3763 CONVERT_CHECKED(String, str1, args[0]);
3764 CONVERT_CHECKED(String, str2, args[1]); 3764 CONVERT_CHECKED(String, str2, args[1]);
3765 Counters::cons_strings_runtime.Increment();
3766 return Heap::AllocateConsString(str1, str2); 3765 return Heap::AllocateConsString(str1, str2);
3767 } 3766 }
3768 3767
3769 3768
3770 template<typename sinkchar> 3769 template<typename sinkchar>
3771 static inline void StringBuilderConcatHelper(String* special, 3770 static inline void StringBuilderConcatHelper(String* special,
3772 sinkchar* sink, 3771 sinkchar* sink,
3773 FixedArray* fixed_array, 3772 FixedArray* fixed_array,
3774 int array_length) { 3773 int array_length) {
3775 int position = 0; 3774 int position = 0;
(...skipping 4139 matching lines...) Expand 10 before | Expand all | Expand 10 after
7915 } else { 7914 } else {
7916 // Handle last resort GC and make sure to allow future allocations 7915 // Handle last resort GC and make sure to allow future allocations
7917 // to grow the heap without causing GCs (if possible). 7916 // to grow the heap without causing GCs (if possible).
7918 Counters::gc_last_resort_from_js.Increment(); 7917 Counters::gc_last_resort_from_js.Increment();
7919 Heap::CollectAllGarbage(false); 7918 Heap::CollectAllGarbage(false);
7920 } 7919 }
7921 } 7920 }
7922 7921
7923 7922
7924 } } // namespace v8::internal 7923 } } // 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