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

Side by Side Diff: runtime/bin/builtin_nolib.cc

Issue 1126233009: Instead of aborting in Builtin::LoadAndCheckLibrary let the caller handle the error condition accor… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 7 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 | « runtime/bin/builtin.cc ('k') | runtime/bin/dartutils.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 (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, 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 <stdio.h> 5 #include <stdio.h>
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 8
9 #include "bin/builtin.h" 9 #include "bin/builtin.h"
10 #include "bin/dartutils.h" 10 #include "bin/dartutils.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 "Unreachable code in Builtin::LoadLibrary (%d).", id); 59 "Unreachable code in Builtin::LoadLibrary (%d).", id);
60 } 60 }
61 61
62 62
63 Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) { 63 Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) {
64 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) == 64 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
65 kInvalidLibrary); 65 kInvalidLibrary);
66 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary); 66 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
67 Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_); 67 Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_);
68 Dart_Handle library = Dart_LookupLibrary(url); 68 Dart_Handle library = Dart_LookupLibrary(url);
69 DART_CHECK_VALID(library);
70 return library; 69 return library;
71 } 70 }
72 71
73 } // namespace bin 72 } // namespace bin
74 } // namespace dart 73 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/bin/builtin.cc ('k') | runtime/bin/dartutils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698