Fix infinite recursion when dealing with cyclic library dependencies.

bin/main.cc

 // Copyright (c) 2011, 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 <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
@@ skipping 171 matching lines @@
     return 255;
   }
 
   // Initialize the Dart VM.
   Dart_Initialize(vm_options.count(),
                   vm_options.arguments(),
                   MainIsolateInitCallback);
 
   // Create an isolate. As a side effect, MainIsolateInitCallback
   // gets called, which loads the scripts and libraries.
-  Dart_Isolate isolate = Dart_CreateIsolate(snapshot_buffer, script_name);
+  char* canonical_script_name = File::GetCanonicalPath(script_name);
+  if (canonical_script_name == NULL) {
+    fprintf(stderr, "Unable to find '%s'\n", script_name);
+    return 255;  // Indicates we encountered an error.
+  }
+  Dart_Isolate isolate = Dart_CreateIsolate(snapshot_buffer,
+                                            canonical_script_name);
   if (isolate == NULL) {
+    free(canonical_script_name);
     return 255;
   }
 
   Dart_EnterScope();
   // TODO(asiva): Create a dart options object that can be accessed from
   // dart code.
   if (HasCompileAll(vm_options)) {
     Dart_Result result = Dart_CompileAll();
     if (!Dart_IsValidResult(result)) {
       fprintf(stderr, "%s\n", Dart_GetErrorCString(result));
       Dart_ExitScope();
       Dart_ShutdownIsolate();
+      free(canonical_script_name);
       return 255;  // Indicates we encountered an error.
     }
   }
 
   // Lookup and invoke the top level main function.
-  Dart_Handle script_url = Dart_NewString(script_name);
+  Dart_Handle script_url = Dart_NewString(canonical_script_name);
   Dart_Result result = Dart_LookupLibrary(script_url);
   if (!Dart_IsValidResult(result)) {
     fprintf(stderr, "%s\n", Dart_GetErrorCString(result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
+    free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
   Dart_Handle library = Dart_GetResult(result);
   result = Dart_InvokeStatic(library,
                              Dart_NewString(""),
                              Dart_NewString("main"),
                              0,
                              NULL);
 
   if (Dart_IsValidResult(result)) {
     Dart_Handle result_obj = Dart_GetResult(result);
     if (Dart_ExceptionOccurred(result_obj)) {
       // Print the exception object.
       fprintf(stderr, "An unhandled exception has been thrown\n");
       Dart_Result exception_result = Dart_GetException(result_obj);
       assert(Dart_IsValidResult(exception_result));
       PrintObject(stderr, Dart_GetResult(exception_result));
       // Print the stack trace.
       Dart_Result stacktrace = Dart_GetStacktrace(result_obj);
       assert(Dart_IsValidResult(stacktrace));
       PrintObject(stderr, Dart_GetResult(stacktrace));
       fprintf(stderr, "\n");
       Dart_ExitScope();
       Dart_ShutdownIsolate();
+      free(canonical_script_name);
       return 255;  // We had an unhandled exception, hence indicate an error.
     }
   } else {
     fprintf(stderr, "%s\n", Dart_GetErrorCString(result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
+    free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
   // Keep handling messages until the last active receive port is closed.
   result = Dart_RunLoop();
   if (!Dart_IsValidResult(result)) {
     fprintf(stderr, "%s\n", Dart_GetErrorCString(result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
+    free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
+  free(canonical_script_name);
   Dart_ExitScope();
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   return 0;
 }