Fix bug where Script files that only contained patches were lost from the list of LoadedScripts() T…

runtime/vm/object.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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 6771 matching lines @@
   dict.SetAt(index, obj);
 }
 
 
 void Library::AddClass(const Class& cls) const {
   AddObject(cls, String::Handle(cls.Name()));
   // Link class to this library.
   cls.set_library(*this);
 }
 
+static void AddScriptIfUnique(const GrowableObjectArray& scripts,
+                              Script& candidate) {
+  Script& script_obj = Script::Handle();

[siva, 2013/09/06 15:33:51]

Move the handle creation below the null check so we don't create a handle if it
is null.

+  if (candidate.IsNull())
+    return;
+  if (candidate.raw() == Object::null())
+    return;

[siva, 2013/09/06 15:33:51]

Seems like duplicate checks:

candidate.IsNull() is the same as candidate.raw() == Object::null()

+
+  for (int i = 0; i < scripts.Length(); i++) {
+    script_obj ^= scripts.At(i);
+    if (script_obj.raw() == candidate.raw()) {
+      // We already have a reference to this script.
+      return;
+    }
+  }
+  // Add script to the list of scripts.
+  scripts.Add(candidate);
+}
 
 RawArray* Library::LoadedScripts() const {
   // We compute the list of loaded scripts lazily. The result is
   // cached in loaded_scripts_.
   if (loaded_scripts() == Array::null()) {
     // Iterate over the library dictionary and collect all scripts.
     const GrowableObjectArray& scripts =
         GrowableObjectArray::Handle(GrowableObjectArray::New(8));
     Object& entry = Object::Handle();
     Class& cls = Class::Handle();
+    Class& patch_cls = Class::Handle();
     Script& owner_script = Script::Handle();
+    Script& patch_script = Script::Handle();
     DictionaryIterator it(*this);
-    Script& script_obj = Script::Handle();
     while (it.HasNext()) {
       entry = it.GetNext();
       if (entry.IsClass()) {
         owner_script = Class::Cast(entry).script();
+        patch_cls = Class::Cast(entry).patch_class();
+        if (!patch_cls.IsNull()) {
+          patch_script = patch_cls.script();
+          AddScriptIfUnique(scripts, patch_script);
+        }
       } else if (entry.IsFunction()) {
         owner_script = Function::Cast(entry).script();
       } else if (entry.IsField()) {
         cls = Field::Cast(entry).owner();
         owner_script = cls.script();
       } else {
         continue;
       }
-      if (owner_script.IsNull()) {
-        continue;
-      }
-      bool is_unique = true;
-      for (int i = 0; i < scripts.Length(); i++) {
-        script_obj ^= scripts.At(i);
-        if (script_obj.raw() == owner_script.raw()) {
-          // We already have a reference to this script.
-          is_unique = false;
-          break;
-        }
-      }
-      if (is_unique) {
-        // Add script to the list of scripts.
-        scripts.Add(owner_script);
-      }
+      AddScriptIfUnique(scripts, owner_script);
     }
 
     // Create the array of scripts and cache it in loaded_scripts_.
     const Array& scripts_array = Array::Handle(Array::MakeArray(scripts));
     StorePointer(&raw_ptr()->loaded_scripts_, scripts_array.raw());
   }
   return loaded_scripts();
 }
 
 
@@ skipping 8085 matching lines @@
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   stream->OpenObject();
   stream->CloseObject();
 }
 
 
 }  // namespace dart