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

runtime/vm/dart_api_impl_test.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 "bin/builtin.h"
 #include "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
@@ skipping 5278 matching lines @@
   "  var _f;\n"
   "  callFunc(x, y) => x(y);\n"
   "  external void method(var value);\n"
   "  get field => _field;\n"
   "}\n"
   "class B {\n"
   "  var val;\n"
   "  external B.named(x);\n"
   "  external B(v);\n"
   "}\n"
+  "class C {\n"
+  "  external int method();\n"
+  "}\n"
+  "\n"
   "external int unpatched();\n"
   "external int topLevel(var value);\n"
+  "external int topLevel2(var value);\n"
   "external int get topLevelGetter;\n"
   "external void set topLevelSetter(int value);\n";
 
   const char* kPatchChars =
   "patch class A {\n"
   "  var _g;\n"
   "  A() : fvalue = 13;\n"
   "  get _field => _g;\n"
   "  /*patch*/ void method(var value) {\n"
   "    int closeYourEyes(var eggs) { return eggs * -1; }\n"
   "    value = callFunc(closeYourEyes, value);\n"
   "    _g = value * 5;\n"
   "  }\n"
   "}\n"
   "patch class B {\n"
   "  B._internal(x) : val = x;\n"
   "  /*patch*/ factory B.named(x) { return new B._internal(x); }\n"
   "  /*patch*/ factory B(v) native \"const_B_factory\";\n"
   "}\n"
   "var _topLevelValue = -1;\n"
   "patch int topLevel(var value) => value * value;\n"
   "patch int set topLevelSetter(value) { _topLevelValue = value; }\n"
   "patch int get topLevelGetter => 2 * _topLevelValue;\n"
   // Allow top level methods named patch.
-  "patch(x) => x*3;\n";
+  "patch(x) => x*3;\n"
+  ;  // NOLINT
+
+  const char* kPatchClassOnlyChars =
+  "patch class C {\n"
+  "  /*patch*/ int method() {\n"
+  "    return 42;\n"
+  "  }\n"
+  "}\n"
+  ;  // NOLINT
+
+  const char* kPatchNoClassChars =
+  "patch topLevel2(x) => x * 2;\n";
 
   const char* kScriptChars =
   "import 'theLibrary';\n"
   "e1() => unpatched();\n"
   "m1() => topLevel(2);\n"
   "m2() {\n"
   "  topLevelSetter = 20;\n"
   "  return topLevelGetter;\n"
   "}\n"
   "m3() => patch(7);\n"
@@ skipping 13 matching lines @@
   bin::Builtin::SetNativeResolver(bin::Builtin::kIOLibrary);
 
   Dart_Handle result = Dart_SetLibraryTagHandler(library_handler);
   EXPECT_VALID(result);
 
   Dart_Handle url = NewString("theLibrary");
   Dart_Handle source = NewString(kLibraryChars);
   result = Dart_LoadLibrary(url, source);
   EXPECT_VALID(result);
 
-  const String& patch_url = String::Handle(String::New("theLibrary patch"));
-  const String& patch_source = String::Handle(String::New(kPatchChars));
-  const Script& patch_script = Script::Handle(Script::New(
-      patch_url, patch_source, RawScript::kPatchTag));
+  const char* patchNames[] = { "main library patch",
+                               "patch class only",
+                               "patch no class" };
+  const char* patches[] = { kPatchChars,
+                            kPatchClassOnlyChars,
+                            kPatchNoClassChars };
+  const String& lib_url = String::Handle(String::New("theLibrary"));
 
-  const String& lib_url = String::Handle(String::New("theLibrary"));
   const Library& lib = Library::Handle(Library::LookupLibrary(lib_url));
-  const Error& err = Error::Handle(lib.Patch(patch_script));
-  if (!err.IsNull()) {
-    OS::Print("Patching error: %s\n", err.ToErrorCString());
-    EXPECT(false);
+
+  for (int i = 0; i < 3; i++) {
+    const String& patch_url = String::Handle(String::New(patchNames[i]));
+    const String& patch_source = String::Handle(String::New(patches[i]));
+    const Script& patch_script = Script::Handle(Script::New(
+        patch_url, patch_source, RawScript::kPatchTag));
+
+    const Error& err = Error::Handle(lib.Patch(patch_script));
+    if (!err.IsNull()) {
+      OS::Print("Patching error: %s\n", err.ToErrorCString());
+      EXPECT(false);
+    }
   }
   result = Dart_SetNativeResolver(result, &PatchNativeResolver);
   EXPECT_VALID(result);
 
   Dart_Handle script_url = NewString("theScript");
   source = NewString(kScriptChars);
   Dart_Handle test_script = Dart_LoadScript(script_url, source, 0, 0);
   EXPECT_VALID(test_script);
 
   // Make sure that we can compile all of the patched code.
@@ skipping 34 matching lines @@
   result = Dart_Invoke(test_script, NewString("m5"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsNull(result));
 
   value = 0;
   result = Dart_Invoke(test_script, NewString("m6"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   EXPECT_VALID(Dart_IntegerToInt64(result, &value));
   EXPECT_EQ(8, value);
+
+  // Make sure all source files show up in the patched library.
+  const Array& lib_scripts = Array::Handle(lib.LoadedScripts());
+  EXPECT_EQ(4, lib_scripts.Length());
 }
 
 
 static void MyNativeFunction1(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_SetReturnValue(args, Dart_NewInteger(654321));
   Dart_ExitScope();
 }
 
 
@@ skipping 1852 matching lines @@
                                    NewString("main"),
                                    0,
                                    NULL);
   int64_t value = 0;
   result = Dart_IntegerToInt64(result, &value);
   EXPECT_VALID(result);
   EXPECT_EQ(8, value);
 }
 
 }  // namespace dart