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/execution.cc

Issue 7970: Reverted r576 as it caused a regression. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 12 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 | src/top.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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 // Call the function through the right JS entry stub. 85 // Call the function through the right JS entry stub.
86 value = CALL_GENERATED_CODE(entry, func->code()->entry(), *func, 86 value = CALL_GENERATED_CODE(entry, func->code()->entry(), *func,
87 *receiver, argc, args); 87 *receiver, argc, args);
88 } 88 }
89 89
90 #ifdef DEBUG 90 #ifdef DEBUG
91 value->Verify(); 91 value->Verify();
92 #endif 92 #endif
93 93
94 // Update the pending exception and external caught flag and return the value. 94 // Update the pending exception flag and return the value.
95 *has_pending_exception = value->IsException(); 95 *has_pending_exception = value->IsException();
96 ASSERT(*has_pending_exception == Top::has_pending_exception()); 96 ASSERT(*has_pending_exception == Top::has_pending_exception());
97 Top::propagate_external_caught(); 97 if (*has_pending_exception) {
98 Top::setup_external_caught();
99 }
98 100
99 // If the pending exception is OutOfMemoryException set out_of_memory in 101 // If the pending exception is OutOfMemoryException set out_of_memory in
100 // the global context. Note: We have to mark the global context here 102 // the global context. Note: We have to mark the global context here
101 // since the GenerateThrowOutOfMemory stub cannot make a RuntimeCall to 103 // since the GenerateThrowOutOfMemory stub cannot make a RuntimeCall to
102 // set it. 104 // set it.
103 if (*has_pending_exception) { 105 if (*has_pending_exception) {
104 if (Top::pending_exception() == Failure::OutOfMemoryException()) { 106 if (Top::pending_exception() == Failure::OutOfMemoryException()) {
105 Top::context()->mark_out_of_memory(); 107 Top::context()->mark_out_of_memory();
106 } 108 }
107 } 109 }
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 // All allocation spaces other than NEW_SPACE have the same effect. 522 // All allocation spaces other than NEW_SPACE have the same effect.
521 Heap::CollectGarbage(0, OLD_DATA_SPACE); 523 Heap::CollectGarbage(0, OLD_DATA_SPACE);
522 return v8::Undefined(); 524 return v8::Undefined();
523 } 525 }
524 526
525 527
526 static GCExtension kGCExtension; 528 static GCExtension kGCExtension;
527 v8::DeclareExtension kGCExtensionDeclaration(&kGCExtension); 529 v8::DeclareExtension kGCExtensionDeclaration(&kGCExtension);
528 530
529 } } // namespace v8::internal 531 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/top.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698