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

Side by Side Diff: src/top.cc

Issue 1094014: Merge the partial_snapshots branch back into bleeding_edge. For... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 10 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 | Annotate | Revision Log
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 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 Execution::GetStackTraceLine(recv, fun, pos_obj, is_top_level); 672 Execution::GetStackTraceLine(recv, fun, pos_obj, is_top_level);
673 if (line->length() > 0) { 673 if (line->length() > 0) {
674 line->PrintOn(out); 674 line->PrintOn(out);
675 fprintf(out, "\n"); 675 fprintf(out, "\n");
676 } 676 }
677 } 677 }
678 } 678 }
679 679
680 680
681 void Top::ComputeLocation(MessageLocation* target) { 681 void Top::ComputeLocation(MessageLocation* target) {
682 *target = MessageLocation(empty_script(), -1, -1); 682 *target = MessageLocation(Handle<Script>(Heap::empty_script()), -1, -1);
683 StackTraceFrameIterator it; 683 StackTraceFrameIterator it;
684 if (!it.done()) { 684 if (!it.done()) {
685 JavaScriptFrame* frame = it.frame(); 685 JavaScriptFrame* frame = it.frame();
686 JSFunction* fun = JSFunction::cast(frame->function()); 686 JSFunction* fun = JSFunction::cast(frame->function());
687 Object* script = fun->shared()->script(); 687 Object* script = fun->shared()->script();
688 if (script->IsScript() && 688 if (script->IsScript() &&
689 !(Script::cast(script)->source()->IsUndefined())) { 689 !(Script::cast(script)->source()->IsUndefined())) {
690 int pos = frame->code()->SourcePosition(frame->pc()); 690 int pos = frame->code()->SourcePosition(frame->pc());
691 // Compute the location from the function and the reloc info. 691 // Compute the location from the function and the reloc info.
692 Handle<Script> casted_script(Script::cast(script)); 692 Handle<Script> casted_script(Script::cast(script));
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 Top::break_access_->Lock(); 977 Top::break_access_->Lock();
978 } 978 }
979 979
980 980
981 ExecutionAccess::~ExecutionAccess() { 981 ExecutionAccess::~ExecutionAccess() {
982 Top::break_access_->Unlock(); 982 Top::break_access_->Unlock();
983 } 983 }
984 984
985 985
986 } } // namespace v8::internal 986 } } // namespace v8::internal
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698