Fix some assertion failures on Fuchsia

runtime/bin/loader.cc

 // Copyright (c) 2016, 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 "bin/loader.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/extensions.h"
@@ skipping 272 matching lines @@
           (strstr(path, File::PathSeparator()) != NULL));
 }
 
 
 void Loader::AddDependencyLocked(Loader* loader, const char* resolved_uri) {
   MallocGrowableArray<char*>* dependencies =
       loader->isolate_data_->dependencies();
   if (dependencies == NULL) {
     return;
   }
-  uint8_t* scoped_file_path = NULL;
-  intptr_t scoped_file_path_length = -1;
-  Dart_Handle uri = Dart_NewStringFromCString(resolved_uri);
-  ASSERT(!Dart_IsError(uri));
-  Dart_Handle result = Loader::ResolveAsFilePath(uri, &scoped_file_path,
-                                                 &scoped_file_path_length);
-  if (Dart_IsError(result)) {
-    Log::Print("Error resolving dependency: %s\n", Dart_GetError(result));
+  dependencies->Add(strdup(resolved_uri));
+}
+

[zra, 2017/04/26 20:25:01]

two newlines between functions.

[rmacnak, 2017/04/26 20:34:06]

Done.

+void Loader::ResolveDependenciesAsFilePaths() {
+  IsolateData* isolate_data =
+      reinterpret_cast<IsolateData*>(Dart_CurrentIsolateData());
+  ASSERT(isolate_data != NULL);
+  MallocGrowableArray<char*>* dependencies = isolate_data->dependencies();
+  if (dependencies == NULL) {
     return;
   }
-  dependencies->Add(StringUtils::StrNDup(
-      reinterpret_cast<const char*>(scoped_file_path),
-      scoped_file_path_length));
+
+  for (intptr_t i = 0; i < dependencies->length(); i++) {
+    char* resolved_uri = (*dependencies)[i];
+
+    uint8_t* scoped_file_path = NULL;
+    intptr_t scoped_file_path_length = -1;
+    Dart_Handle uri = Dart_NewStringFromCString(resolved_uri);
+    ASSERT(!Dart_IsError(uri));
+    Dart_Handle result = Loader::ResolveAsFilePath(uri, &scoped_file_path,
+                                                   &scoped_file_path_length);
+    if (Dart_IsError(result)) {
+      Log::Print("Error resolving dependency: %s\n", Dart_GetError(result));
+      return;
+    }
+
+    (*dependencies)[i] =
+        StringUtils::StrNDup(reinterpret_cast<const char*>(scoped_file_path),
+                             scoped_file_path_length);
+    free(resolved_uri);
+  }
 }
 
 
 bool Loader::ProcessResultLocked(Loader* loader, Loader::IOResult* result) {
   // We have to copy everything we care about out of |result| because after
   // dropping the lock below |result| may no longer valid.
   Dart_Handle uri =
       Dart_NewStringFromCString(reinterpret_cast<char*>(result->uri));
   Dart_Handle resolved_uri =
       Dart_NewStringFromCString(reinterpret_cast<char*>(result->resolved_uri));
@@ skipping 555 matching lines @@
   MutexLocker ml(loader_infos_lock_);
   Loader* loader = LoaderForLocked(dest_port_id);
   if (loader == NULL) {
     return;
   }
   loader->QueueMessage(message);
 }
 
 }  // namespace bin
 }  // namespace dart