- Include sources in gen_snapshot and dart_no_snapshot to allow

runtime/bin/builtin.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <stdio.h>
 
 #include "include/dart_api.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/platform.h"
 
 namespace dart {
 namespace bin {
 
 Builtin::builtin_lib_props Builtin::builtin_libraries_[] = {
   /* { url_, source_, patch_url_, patch_source_, has_natives_ } */
   { DartUtils::kBuiltinLibURL, _builtin_source_paths_, NULL, NULL, true },
   { DartUtils::kIOLibURL, io_source_paths_,
     DartUtils::kIOLibPatchURL, io_patch_paths_, true },
 };
 
 Dart_Port Builtin::load_port_ = ILLEGAL_PORT;
 
 // Patch all the specified patch files in the array 'patch_files' into the
 // library specified in 'library'.
 static void LoadPatchFiles(Dart_Handle library,
                            const char* patch_uri,
                            const char** patch_files) {
-  for (intptr_t j = 0; patch_files[j] != NULL; j += 2) {
+  for (intptr_t j = 0; patch_files[j] != NULL; j += 3) {
     Dart_Handle patch_src = DartUtils::ReadStringFromFile(patch_files[j + 1]);
+    if (!Dart_IsString(patch_src)) {
+      // In case reading the file caused an error, use the sources directly.
+      const char* source = patch_files[j + 2];
+      patch_src = Dart_NewStringFromUTF8(
+          reinterpret_cast<const uint8_t*>(source), strlen(source));
+    }
 
     // Prepend the patch library URI to form a unique script URI for the patch.
     intptr_t len = snprintf(NULL, 0, "%s/%s", patch_uri, patch_files[j]);
     char* patch_filename = reinterpret_cast<char*>(malloc(len + 1));
     snprintf(patch_filename, len + 1, "%s/%s", patch_uri, patch_files[j]);
     Dart_Handle patch_file_uri = DartUtils::NewString(patch_filename);
     free(patch_filename);
 
     DART_CHECK_VALID(Dart_LibraryLoadPatch(library, patch_file_uri, patch_src));
   }
@@ skipping 20 matching lines @@
   // Try to read the source using the path specified for the uri.
   const char** source_paths = builtin_libraries_[id].source_paths_;
   return GetSource(source_paths, part_uri);
 }
 
 
 Dart_Handle Builtin::GetSource(const char** source_paths, const char* uri) {
   if (source_paths == NULL) {
     return Dart_Null();  // No path mapping information exists for library.
   }
-  const char* source_path = NULL;
-  for (intptr_t i = 0; source_paths[i] != NULL; i += 2) {
+  for (intptr_t i = 0; source_paths[i] != NULL; i += 3) {
     if (!strcmp(uri, source_paths[i])) {
-      source_path = source_paths[i + 1];
-      break;
+      const char* source_path = source_paths[i + 1];
+      Dart_Handle src = DartUtils::ReadStringFromFile(source_path);
+      if (!Dart_IsString(src)) {
+        // In case reading the file caused an error, use the sources directly.
+        const char* source = source_paths[i + 2];
+        src = Dart_NewStringFromUTF8(
+            reinterpret_cast<const uint8_t*>(source), strlen(source));
+      }
+      return src;
     }
   }
-  if (source_path == NULL) {
-    return Dart_Null();  // Uri does not exist in path mapping information.
-  }
-  return DartUtils::ReadStringFromFile(source_path);
+  return Dart_Null();  // Uri does not exist in path mapping information.
 }
 
 
 void Builtin::SetNativeResolver(BuiltinLibraryId id) {
   UNREACHABLE();
 }
 
 
 Dart_Handle Builtin::LoadLibrary(Dart_Handle url, BuiltinLibraryId id) {
   Dart_Handle library = Dart_LoadLibrary(url, Source(id), 0, 0);
@@ skipping 19 matching lines @@
   Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_);
   Dart_Handle library = Dart_LookupLibrary(url);
   if (Dart_IsError(library)) {
     library = LoadLibrary(url, id);
   }
   return library;
 }
 
 }  // namespace bin
 }  // namespace dart