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

Side by Side Diff: src/frames.cc

Issue 6664001: [Isolates] Merge (7083,7111] from bleeding_edge. (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/frames.h ('k') | src/handles.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 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 return IsConstructFrame(fp); 631 return IsConstructFrame(fp);
632 } 632 }
633 633
634 634
635 Code* JavaScriptFrame::unchecked_code() const { 635 Code* JavaScriptFrame::unchecked_code() const {
636 JSFunction* function = JSFunction::cast(this->function()); 636 JSFunction* function = JSFunction::cast(this->function());
637 return function->unchecked_code(); 637 return function->unchecked_code();
638 } 638 }
639 639
640 640
641 int JavaScriptFrame::GetProvidedParametersCount() const {
642 return ComputeParametersCount();
643 }
644
645
646 Address JavaScriptFrame::GetCallerStackPointer() const { 641 Address JavaScriptFrame::GetCallerStackPointer() const {
647 int arguments; 642 int arguments;
648 if (SafeStackFrameIterator::is_active() || 643 if (SafeStackFrameIterator::is_active() ||
649 HEAP->gc_state() != Heap::NOT_IN_GC) { 644 HEAP->gc_state() != Heap::NOT_IN_GC) {
650 // If the we are currently iterating the safe stack the 645 // If the we are currently iterating the safe stack the
651 // arguments for frames are traversed as if they were 646 // arguments for frames are traversed as if they were
652 // expression stack elements of the calling frame. The reason for 647 // expression stack elements of the calling frame. The reason for
653 // this rather strange decision is that we cannot access the 648 // this rather strange decision is that we cannot access the
654 // function during mark-compact GCs when objects may have been marked. 649 // function during mark-compact GCs when objects may have been marked.
655 // In fact accessing heap objects (like function->shared() below) 650 // In fact accessing heap objects (like function->shared() below)
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 ZoneList<StackFrame*> list(10); 1233 ZoneList<StackFrame*> list(10);
1239 for (StackFrameIterator it; !it.done(); it.Advance()) { 1234 for (StackFrameIterator it; !it.done(); it.Advance()) {
1240 StackFrame* frame = AllocateFrameCopy(it.frame()); 1235 StackFrame* frame = AllocateFrameCopy(it.frame());
1241 list.Add(frame); 1236 list.Add(frame);
1242 } 1237 }
1243 return list.ToVector(); 1238 return list.ToVector();
1244 } 1239 }
1245 1240
1246 1241
1247 } } // namespace v8::internal 1242 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/frames.h ('k') | src/handles.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698