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

Side by Side Diff: runtime/vm/dart_api_impl.cc

Issue 1193873003: Fix build break. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 6 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "include/dart_api.h" 5 #include "include/dart_api.h"
6 #include "include/dart_mirrors_api.h" 6 #include "include/dart_mirrors_api.h"
7 #include "include/dart_native_api.h" 7 #include "include/dart_native_api.h"
8 8
9 #include "platform/assert.h" 9 #include "platform/assert.h"
10 #include "vm/class_finalizer.h" 10 #include "vm/class_finalizer.h"
(...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 return Api::NewHandle(isolate, ApiError::New(message)); 808 return Api::NewHandle(isolate, ApiError::New(message));
809 } 809 }
810 810
811 811
812 DART_EXPORT Dart_Handle Dart_NewUnhandledExceptionError(Dart_Handle exception) { 812 DART_EXPORT Dart_Handle Dart_NewUnhandledExceptionError(Dart_Handle exception) {
813 Isolate* isolate = Isolate::Current(); 813 Isolate* isolate = Isolate::Current();
814 DARTSCOPE(isolate); 814 DARTSCOPE(isolate);
815 CHECK_CALLBACK_STATE(isolate); 815 CHECK_CALLBACK_STATE(isolate);
816 816
817 Instance& obj = Instance::Handle(isolate); 817 Instance& obj = Instance::Handle(isolate);
818 if (Dart_IsApiError(exception) || Dart_IsCompilationError(exception)) { 818 intptr_t class_id = Api::ClassId(exception);
819 if ((class_id == kApiErrorCid) || (class_id == kLanguageErrorCid)) {
819 obj = String::New(Dart_GetError(exception)); 820 obj = String::New(Dart_GetError(exception));
820 } else { 821 } else {
821 obj = Api::UnwrapInstanceHandle(isolate, exception).raw(); 822 obj = Api::UnwrapInstanceHandle(isolate, exception).raw();
822 if (obj.IsNull()) { 823 if (obj.IsNull()) {
823 RETURN_TYPE_ERROR(isolate, exception, Instance); 824 RETURN_TYPE_ERROR(isolate, exception, Instance);
824 } 825 }
825 } 826 }
826 const Stacktrace& stacktrace = Stacktrace::Handle(isolate); 827 const Stacktrace& stacktrace = Stacktrace::Handle(isolate);
827 return Api::NewHandle(isolate, UnhandledException::New(obj, stacktrace)); 828 return Api::NewHandle(isolate, UnhandledException::New(obj, stacktrace));
828 } 829 }
(...skipping 4957 matching lines...) Expand 10 before | Expand all | Expand 10 after
5786 ASSERT(stream != NULL); 5787 ASSERT(stream != NULL);
5787 TimelineEvent* event = stream->StartEvent(); 5788 TimelineEvent* event = stream->StartEvent();
5788 if (event != NULL) { 5789 if (event != NULL) {
5789 event->AsyncEnd(label, async_id); 5790 event->AsyncEnd(label, async_id);
5790 event->Complete(); 5791 event->Complete();
5791 } 5792 }
5792 return Api::Success(); 5793 return Api::Success();
5793 } 5794 }
5794 5795
5795 } // namespace dart 5796 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698