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

Side by Side Diff: src/runtime.cc

Issue 7466053: Merge r8730 into 3.4 branch, removing a forgotten debug code. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.4/
Patch Set: Created 9 years, 4 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/version.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 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 11174 matching lines...) Expand 10 before | Expand all | Expand 10 after
11185 Handle<SerializedScopeInfo> scope_info, 11185 Handle<SerializedScopeInfo> scope_info,
11186 const ScopeInfo<>* sinfo, 11186 const ScopeInfo<>* sinfo,
11187 Handle<Context> function_context) { 11187 Handle<Context> function_context) {
11188 // Try to find the value of 'arguments' to pass as parameter. If it is not 11188 // Try to find the value of 'arguments' to pass as parameter. If it is not
11189 // found (that is the debugged function does not reference 'arguments' and 11189 // found (that is the debugged function does not reference 'arguments' and
11190 // does not support eval) then create an 'arguments' object. 11190 // does not support eval) then create an 'arguments' object.
11191 int index; 11191 int index;
11192 if (sinfo->number_of_stack_slots() > 0) { 11192 if (sinfo->number_of_stack_slots() > 0) {
11193 index = scope_info->StackSlotIndex(isolate->heap()->arguments_symbol()); 11193 index = scope_info->StackSlotIndex(isolate->heap()->arguments_symbol());
11194 if (index != -1) { 11194 if (index != -1) {
11195 CHECK(false);
11196 return Handle<Object>(frame->GetExpression(index), isolate); 11195 return Handle<Object>(frame->GetExpression(index), isolate);
11197 } 11196 }
11198 } 11197 }
11199 11198
11200 if (sinfo->number_of_context_slots() > Context::MIN_CONTEXT_SLOTS) { 11199 if (sinfo->number_of_context_slots() > Context::MIN_CONTEXT_SLOTS) {
11201 index = scope_info->ContextSlotIndex(isolate->heap()->arguments_symbol(), 11200 index = scope_info->ContextSlotIndex(isolate->heap()->arguments_symbol(),
11202 NULL); 11201 NULL);
11203 if (index != -1) { 11202 if (index != -1) {
11204 return Handle<Object>(function_context->get(index), isolate); 11203 return Handle<Object>(function_context->get(index), isolate);
11205 } 11204 }
(...skipping 1489 matching lines...) Expand 10 before | Expand all | Expand 10 after
12695 } else { 12694 } else {
12696 // Handle last resort GC and make sure to allow future allocations 12695 // Handle last resort GC and make sure to allow future allocations
12697 // to grow the heap without causing GCs (if possible). 12696 // to grow the heap without causing GCs (if possible).
12698 isolate->counters()->gc_last_resort_from_js()->Increment(); 12697 isolate->counters()->gc_last_resort_from_js()->Increment();
12699 isolate->heap()->CollectAllGarbage(false); 12698 isolate->heap()->CollectAllGarbage(false);
12700 } 12699 }
12701 } 12700 }
12702 12701
12703 12702
12704 } } // namespace v8::internal 12703 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698