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

Side by Side Diff: src/runtime.cc

Issue 227163008: Change exception type to Object. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 8 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 | « src/messages.cc ('k') | test/cctest/test-compiler.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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 10818 matching lines...) Expand 10 before | Expand all | Expand 10 after
10829 if (structure->IsForeign() || structure->IsAccessorInfo()) { 10829 if (structure->IsForeign() || structure->IsAccessorInfo()) {
10830 Isolate* isolate = heap->isolate(); 10830 Isolate* isolate = heap->isolate();
10831 HandleScope scope(isolate); 10831 HandleScope scope(isolate);
10832 MaybeHandle<Object> maybe_value = JSObject::GetPropertyWithCallback( 10832 MaybeHandle<Object> maybe_value = JSObject::GetPropertyWithCallback(
10833 handle(result->holder(), isolate), 10833 handle(result->holder(), isolate),
10834 handle(receiver, isolate), 10834 handle(receiver, isolate),
10835 handle(structure, isolate), 10835 handle(structure, isolate),
10836 handle(name, isolate)); 10836 handle(name, isolate));
10837 Handle<Object> value; 10837 Handle<Object> value;
10838 if (maybe_value.ToHandle(&value)) return *value; 10838 if (maybe_value.ToHandle(&value)) return *value;
10839 MaybeObject* exception = heap->isolate()->pending_exception(); 10839 Object* exception = heap->isolate()->pending_exception();
10840 heap->isolate()->clear_pending_exception(); 10840 heap->isolate()->clear_pending_exception();
10841 if (caught_exception != NULL) *caught_exception = true; 10841 if (caught_exception != NULL) *caught_exception = true;
10842 return exception; 10842 return exception;
10843 } else { 10843 } else {
10844 return heap->undefined_value(); 10844 return heap->undefined_value();
10845 } 10845 }
10846 } 10846 }
10847 case INTERCEPTOR: 10847 case INTERCEPTOR:
10848 return heap->undefined_value(); 10848 return heap->undefined_value();
10849 case HANDLER: 10849 case HANDLER:
(...skipping 4411 matching lines...) Expand 10 before | Expand all | Expand 10 after
15261 } 15261 }
15262 } 15262 }
15263 15263
15264 15264
15265 void Runtime::OutOfMemory() { 15265 void Runtime::OutOfMemory() {
15266 Heap::FatalProcessOutOfMemory("CALL_AND_RETRY_LAST", true); 15266 Heap::FatalProcessOutOfMemory("CALL_AND_RETRY_LAST", true);
15267 UNREACHABLE(); 15267 UNREACHABLE();
15268 } 15268 }
15269 15269
15270 } } // namespace v8::internal 15270 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/messages.cc ('k') | test/cctest/test-compiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698