Fix Dart2js, analyzer bots

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 213 matching lines @@
 
   // 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 library_uri = Dart_Null();
   if (result->library_uri != NULL) {
     library_uri =
         Dart_NewStringFromCString(reinterpret_cast<char*>(result->library_uri));
   }
-  Dart_Handle source =
-      Dart_NewStringFromUTF8(result->payload,
-                             result->payload_length);
+  // Check for payload and load accordingly.
+  bool is_snapshot = false;
+  const uint8_t* payload = result->payload;
+  intptr_t payload_length = result->payload_length;
+  payload =
+      DartUtils::SniffForMagicNumber(payload,
+                                     &payload_length,
+                                     &is_snapshot);
+  Dart_Handle source = Dart_Null();
+  if (!is_snapshot) {
+    source = Dart_NewStringFromUTF8(result->payload,
+                                    result->payload_length);
+    if (Dart_IsError(source)) {
+      error_  = DartUtils::NewError("%s is not a valid UTF-8 script",
+                                    reinterpret_cast<char*>(result->uri));
+      return false;
+    }
+  }
   intptr_t tag = result->tag;
 
   // No touching.
   result = NULL;
 
   // We must drop the lock here because the tag handler may be recursively
   // invoked and it will attempt to acquire the lock to queue more work.
   monitor_->Exit();
 
   Dart_Handle dart_result = Dart_Null();
 
-
   switch (tag) {
     case Dart_kImportTag:
       dart_result = Dart_LoadLibrary(uri, source, 0, 0);
     break;
     case Dart_kSourceTag: {
       ASSERT(library_uri != Dart_Null());
       Dart_Handle library = Dart_LookupLibrary(library_uri);
       ASSERT(!Dart_IsError(library));
       dart_result = Dart_LoadSource(library, uri, source, 0, 0);
     }
     break;
     case Dart_kScriptTag:
-      dart_result = Dart_LoadScript(uri, source, 0, 0);
+      if (is_snapshot) {
+        dart_result = Dart_LoadScriptFromSnapshot(payload, payload_length);
+      } else {
+        dart_result = Dart_LoadScript(uri, source, 0, 0);
+      }
     break;
     default:
       UNREACHABLE();
   }
 
   // Re-acquire the lock before exiting the function (it was held before entry),
   monitor_->Enter();
   if (Dart_IsError(dart_result)) {
     // Remember the error if we encountered one.
     error_ = dart_result;
@@ skipping 267 matching lines @@
   MutexLocker ml(&loader_infos_lock_);
   Loader* loader = LoaderForLocked(dest_port_id);
   if (loader == NULL) {
     return;
   }
   loader->QueueMessage(message);
 }
 
 }  // namespace bin
 }  // namespace dart