Fix for issue 19817

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_debugger_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
@@ skipping 3857 matching lines @@
   Dart_Handle name;
 
   // Load imported lib.
   Dart_Handle url = NewString("library_url");
   Dart_Handle source = NewString(kImportedScriptChars);
   Dart_Handle imported_lib = Dart_LoadLibrary(url, source);
   Dart_Handle prefix = NewString("");
   EXPECT_VALID(imported_lib);
   Dart_Handle result = Dart_LibraryImportLibrary(lib, imported_lib, prefix);
   EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
   result = Dart_Invoke(imported_lib, NewString("test2"), 0, NULL);
   EXPECT_VALID(result);
 
   // Instance field.
   name = NewString("instance_fld");
   TestFieldNotFound(lib, name);
   TestFieldNotFound(type, name);
   TestFieldOk(instance, name, false, "instance");
 
   // Hidden instance field.
@@ skipping 196 matching lines @@
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   Dart_Handle result;
 
   const int kNumNativeFields = 4;
 
   // Create a test library.
-  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
-                                             native_field_lookup);
+  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL,
+                                             USER_TEST_URI, false);
 
   // Create a native wrapper class with native fields.
   result = Dart_CreateNativeWrapperClass(
       lib,
       NewString("NativeFieldsWrapper"),
       kNumNativeFields);
+  EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   // Load up a test script in the test library.
 
   // Invoke a function which returns an object of type NativeFields.
   result = Dart_Invoke(lib, NewString("testMain"), 0, NULL);
   EXPECT_VALID(result);
   DARTSCOPE(Isolate::Current());
   Instance& obj = Instance::Handle();
   obj ^= Api::UnwrapHandle(result);
   const Class& cls = Class::Handle(obj.clazz());
@@ skipping 19 matching lines @@
       "  final int fld2;\n"
       "  static int fld3;\n"
       "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   Dart_Handle result;
   // Create a test library and Load up a test script in it.
-  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
+  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL,
+                                             USER_TEST_URI, false);
 
   // Invoke a function which returns an object of type NativeFields.
   result = Dart_Invoke(lib, NewString("testMain"), 0, NULL);
 
   // We expect this to fail as class "NativeFields" extends
   // "NativeFieldsWrapper" and there is no definition of it either
   // in the dart code or through the native field injection mechanism.
   EXPECT(Dart_IsError(result));
 }
 
@@ skipping 278 matching lines @@
       "  static const int fld4 = 10;\n"
       "}\n"
       "NativeFields testMain() {\n"
       "  NativeFields obj = new NativeFields(10, 20);\n"
       "  return obj;\n"
       "}\n";
   const int kNumNativeFields = 4;
 
   // Create a test library.
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
-                                             native_field_lookup);
+                                             native_field_lookup,
+                                             USER_TEST_URI,
+                                             false);
 
   // Create a native wrapper class with native fields.
   Dart_Handle result = Dart_CreateNativeWrapperClass(
       lib,
       NewString("NativeFieldsWrapper"),
       kNumNativeFields);
   EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   // Load up a test script in it.
 
   // Invoke a function which returns an object of type NativeFields.
   Dart_Handle retobj = Dart_Invoke(lib, NewString("testMain"), 0, NULL);
   EXPECT_VALID(retobj);
 
   // Now access and set various instance fields of the returned object.
   TestNativeFields(retobj);
 
@@ skipping 764 matching lines @@
 
   // Load lib2
   url = NewString("library2_url");
   source = NewString(kLibrary2Chars);
   Dart_Handle lib2 = Dart_LoadLibrary(url, source);
   EXPECT_VALID(lib2);
 
   // Import lib2 from lib1
   Dart_Handle result = Dart_LibraryImportLibrary(lib1, lib2, Dart_Null());
   EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   // We can invoke both private and non-private local functions.
   EXPECT_VALID(Dart_Invoke(lib1, NewString("local"), 0, NULL));
   EXPECT_VALID(Dart_Invoke(lib1, NewString("_local"), 0, NULL));
 
   // We can only invoke non-private imported functions.
   EXPECT_VALID(Dart_Invoke(lib1, NewString("imported"), 0, NULL));
   EXPECT_ERROR(Dart_Invoke(lib1, NewString("_imported"), 0, NULL),
                "did not find top-level function '_imported'");
 }
@@ skipping 523 matching lines @@
       "Dart_LoadScript expects argument 'source' to be of type String.",
       Dart_GetError(result));
 
   result = Dart_LoadScript(url, error, 0, 0);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("incoming error", Dart_GetError(result));
 
   // Load a script successfully.
   result = Dart_LoadScript(url, source, 0, 0);
   EXPECT_VALID(result);
+  Dart_FinalizeLoading(false);
 
   result = Dart_Invoke(result, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   int64_t value = 0;
   EXPECT_VALID(Dart_IntegerToInt64(result, &value));
   EXPECT_EQ(12345, value);
 
   // Further calls to LoadScript are errors.
   result = Dart_LoadScript(url, source, 0, 0);
@@ skipping 247 matching lines @@
       "class _B {}\n"
       "abstract class _C {}\n"
       "\n"
       "_compare(String a, String b) => a.compareTo(b);\n"
       "sort(list) => list.sort(_compare);\n";
 
   Dart_Handle url = NewString("library_url");
   Dart_Handle source = NewString(kLibraryChars);
   Dart_Handle lib = Dart_LoadLibrary(url, source);
   EXPECT_VALID(lib);
+  Dart_Handle result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   Dart_Handle list = Dart_LibraryGetClassNames(lib);
   EXPECT_VALID(list);
   EXPECT(Dart_IsList(list));
 
   // Sort the list.
   const int kNumArgs = 1;
   Dart_Handle args[1];
   args[0] = list;
   EXPECT_VALID(Dart_Invoke(lib, NewString("sort"), kNumArgs, args));
@@ skipping 31 matching lines @@
       "}\n"
       "\n"
       "_compare(String a, String b) => a.compareTo(b);\n"
       "sort(list) => list.sort(_compare);\n";
 
   // Get the functions from a library.
   Dart_Handle url = NewString("library_url");
   Dart_Handle source = NewString(kLibraryChars);
   Dart_Handle lib = Dart_LoadLibrary(url, source);
   EXPECT_VALID(lib);
+  Dart_Handle result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   Dart_Handle list = Dart_GetFunctionNames(lib);
   EXPECT_VALID(list);
   EXPECT(Dart_IsList(list));
 
   // Sort the list.
   const int kNumArgs = 1;
   Dart_Handle args[1];
   args[0] = list;
   EXPECT_VALID(Dart_Invoke(lib, NewString("sort"), kNumArgs, args));
@@ skipping 95 matching lines @@
       "int foobar() => foo.bar();";
   Dart_Handle url2 = NewString("library2_url");
   Dart_Handle source2 = NewString(kLibrary2Chars);
   Dart_Handle lib2 = Dart_LoadLibrary(url2, source2);
   EXPECT_VALID(lib2);
   EXPECT(Dart_IsLibrary(lib2));
 
   Dart_Handle prefix = NewString("foo");
   Dart_Handle result = Dart_LibraryImportLibrary(lib2, lib1, prefix);
   EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   // Lib1 is imported under a library prefix and therefore 'foo' should
   // not be found directly in lib2.
   Dart_Handle method_name = NewString("foo");
   result = Dart_Invoke(lib2, method_name, 0, NULL);
   EXPECT_ERROR(result, "Dart_Invoke: did not find top-level function 'foo'");
 
   // Check that lib1 is available under the prefix in lib2.
   method_name = NewString("foobar");
   result = Dart_Invoke(lib2, method_name, 0, NULL);
@@ skipping 162 matching lines @@
   const char* kSourceChars =
       "part of library1_name;\n"
       "class NewClass extends OldClass{\n"
       "  bar() => 'bar';\n"
       "}\n";
   Dart_Handle url = NewString("library1_url");
   Dart_Handle source = NewString(kLibrary1Chars);
   Dart_Handle lib = Dart_LoadLibrary(url, source);
   EXPECT_VALID(lib);
   EXPECT(Dart_IsLibrary(lib));
+  Dart_Handle result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   // Call a dynamic function on OldClass.
   Dart_Handle type = Dart_GetType(lib, NewString("OldClass"), 0, NULL);
   EXPECT_VALID(type);
   Dart_Handle recv = Dart_New(type, Dart_Null(), 0, NULL);
-  Dart_Handle result = Dart_Invoke(recv, NewString("foo"), 0, NULL);
+  result = Dart_Invoke(recv, NewString("foo"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsString(result));
   const char* result_cstr = "";
   EXPECT_VALID(Dart_StringToCString(result, &result_cstr));
   EXPECT_STREQ("foo", result_cstr);
 
   // Load a source file late.
   url = NewString("source_url");
   source = NewString(kSourceChars);
   EXPECT_VALID(Dart_LoadSource(lib, url, source));
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   // Call a dynamic function on NewClass in the updated library.
   type = Dart_GetType(lib, NewString("NewClass"), 0, NULL);
   EXPECT_VALID(type);
   recv = Dart_New(type, Dart_Null(), 0, NULL);
   result = Dart_Invoke(recv, NewString("bar"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsString(result));
   result_cstr = "";
   EXPECT_VALID(Dart_StringToCString(result, &result_cstr));
@@ skipping 21 matching lines @@
   source = NewString(kSourceChars);
 
   Dart_Handle result = Dart_LoadSource(lib, url, source);
   EXPECT_VALID(result);
 
   url = NewString("patch_url");
   source = NewString(kPatchChars);
 
   result = Dart_LibraryLoadPatch(lib, url, source);
   EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   result = Dart_Invoke(lib, NewString("foo"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   int64_t value = 0;
   EXPECT_VALID(Dart_IntegerToInt64(result, &value));
   EXPECT_EQ(42, value);
 }
 
 
@@ skipping 127 matching lines @@
       EXPECT(false);
     }
   }
   result = Dart_SetNativeResolver(result, &PatchNativeResolver, NULL);
   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);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   // Make sure that we can compile all of the patched code.
   result = Dart_CompileAll();
   EXPECT_VALID(result);
 
   result = Dart_Invoke(test_script, NewString("e1"), 0, NULL);
   EXPECT_ERROR(result, "No top-level method 'unpatched'");
 
   int64_t value = 0;
   result = Dart_Invoke(test_script, NewString("m1"), 0, NULL);
@@ skipping 82 matching lines @@
   Dart_Handle error = Dart_NewApiError("incoming error");
   Dart_Handle result;
 
   // Load a test script.
   Dart_Handle url = NewString(TestCase::url());
   Dart_Handle source = NewString(kScriptChars);
   result = Dart_SetLibraryTagHandler(library_handler);
   EXPECT_VALID(result);
   Dart_Handle lib = Dart_LoadScript(url, source, 0, 0);
   EXPECT_VALID(lib);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
   EXPECT(Dart_IsLibrary(lib));
   Dart_Handle type = Dart_GetType(lib, NewString("Test"), 0, NULL);
   EXPECT_VALID(type);
 
   result = Dart_SetNativeResolver(Dart_Null(), &MyNativeResolver1, NULL);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ(
       "Dart_SetNativeResolver expects argument 'library' to be non-null.",
       Dart_GetError(result));
 
@@ skipping 72 matching lines @@
   result = Dart_LoadScript(url, source, 0, 0);
 
   url = NewString("library1_dart");
   source = NewString(kLibrary1Chars);
   Dart_LoadLibrary(url, source);
 
   url = NewString("library2_dart");
   source = NewString(kLibrary2Chars);
   Dart_LoadLibrary(url, source);
 
+  Dart_FinalizeLoading(false);
+
   result = Dart_Invoke(result, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
 }
 
 
 // Test that if the same name is imported from two libraries, it is
 // an error if that name is referenced.
 TEST_CASE(ImportLibrary3) {
   const char* kScriptChars =
       "import 'library2_dart';\n"
@@ skipping 16 matching lines @@
   result = Dart_LoadScript(url, source, 0, 0);
   EXPECT_VALID(result);
 
   url = NewString("library2_dart");
   source = NewString(kLibrary2Chars);
   Dart_LoadLibrary(url, source);
 
   url = NewString("library1_dart");
   source = NewString(kLibrary1Chars);
   Dart_LoadLibrary(url, source);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   result = Dart_Invoke(result, NewString("main"), 0, NULL);
   EXPECT(Dart_IsError(result));
   EXPECT_SUBSTRING("NoSuchMethodError", Dart_GetError(result));
 }
 
 
 // Test that if the same name is imported from two libraries, it is
 // not an error if that name is not used.
 TEST_CASE(ImportLibrary4) {
@@ skipping 17 matching lines @@
   result = Dart_LoadScript(url, source, 0, 0);
   EXPECT_VALID(result);
 
   url = NewString("library2_dart");
   source = NewString(kLibrary2Chars);
   Dart_LoadLibrary(url, source);
 
   url = NewString("library1_dart");
   source = NewString(kLibrary1Chars);
   Dart_LoadLibrary(url, source);
+  Dart_FinalizeLoading(false);
 
   result = Dart_Invoke(result, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
 }
 
 
 TEST_CASE(ImportLibrary5) {
   const char* kScriptChars =
       "import 'lib.dart';\n"
       "abstract class Y {\n"
@@ skipping 10 matching lines @@
   // Create a test library and Load up a test script in it.
   Dart_Handle url = NewString(TestCase::url());
   Dart_Handle source = NewString(kScriptChars);
   result = Dart_SetLibraryTagHandler(library_handler);
   EXPECT_VALID(result);
   result = Dart_LoadScript(url, source, 0, 0);
 
   url = NewString("lib.dart");
   source = NewString(kLibraryChars);
   Dart_LoadLibrary(url, source);
+  Dart_FinalizeLoading(false);
 
   result = Dart_Invoke(result, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
 }
 
 
 void NewNativePort_send123(Dart_Port dest_port_id,
                            Dart_CObject *message) {
   // Gets a send port message.
   EXPECT_NOTNULL(message);
@@ skipping 119 matching lines @@
   }
   Dart_Isolate isolate = TestCase::CreateTestIsolate();
   ASSERT(isolate != NULL);
   Dart_EnterScope();
   Dart_Handle url = NewString(TestCase::url());
   Dart_Handle source = NewString(kScriptChars);
   Dart_Handle result = Dart_SetLibraryTagHandler(TestCase::library_handler);
   EXPECT_VALID(result);
   Dart_Handle lib = Dart_LoadScript(url, source, 0, 0);
   EXPECT_VALID(lib);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
   Dart_ExitScope();
   Dart_ExitIsolate();
   bool retval = Dart_IsolateMakeRunnable(isolate);
   EXPECT(retval);
   return isolate;
 }
 
 
 // The error string from the last unhandled exception. This value is only
 // valid until the next Dart_ExitScope().
@@ skipping 121 matching lines @@
                                         bin::snapshot_buffer,
                                         NULL, &error);
     EXPECT(shared_isolate != NULL);
     Dart_EnterScope();
     Dart_Handle url = NewString(TestCase::url());
     Dart_Handle source = NewString(kScriptChars);
     Dart_Handle result = Dart_SetLibraryTagHandler(TestCase::library_handler);
     EXPECT_VALID(result);
     lib = Dart_LoadScript(url, source, 0, 0);
     EXPECT_VALID(lib);
+    result = Dart_FinalizeLoading(false);
+    EXPECT_VALID(result);
     result =
         Dart_SetNativeResolver(lib, &IsolateInterruptTestNativeLookup, NULL);
     DART_CHECK_VALID(result);
 
     sync->Notify();
     sync->Exit();
   }
 
   Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT(Dart_IsError(result));
@@ skipping 165 matching lines @@
   Isolate::SetShutdownCallback(IsolateShutdownRunDartCodeTestCallback);
 
   {
     Dart_EnterScope();
     Dart_Handle url = NewString(TestCase::url());
     Dart_Handle source = NewString(kScriptChars);
     Dart_Handle result = Dart_SetLibraryTagHandler(TestCase::library_handler);
     EXPECT_VALID(result);
     Dart_Handle lib = Dart_LoadScript(url, source, 0, 0);
     EXPECT_VALID(lib);
+    result = Dart_FinalizeLoading(false);
+    EXPECT_VALID(result);
     result = Dart_Invoke(lib, NewString("main"), 0, NULL);
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
 
 
   // The shutdown callback has not been called.
   EXPECT_EQ(0, add_result);
 
   EXPECT(isolate != NULL);
@@ skipping 160 matching lines @@
   // Load a test script.
   Dart_Handle url = NewString(TestCase::url());
   Dart_Handle source = NewString(kScriptChars);
   result = Dart_SetLibraryTagHandler(library_handler);
   EXPECT_VALID(result);
   Dart_Handle lib = Dart_LoadScript(url, source, 0, 0);
   EXPECT_VALID(lib);
   EXPECT(Dart_IsLibrary(lib));
   result = Dart_SetNativeResolver(lib, &MyNativeClosureResolver, NULL);
   EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   result = Dart_Invoke(lib, NewString("testMain"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   int64_t value = 0;
   EXPECT_VALID(Dart_IntegerToInt64(result, &value));
   EXPECT_EQ(0, value);
 }
 
 
@@ skipping 127 matching lines @@
   // Load a test script.
   Dart_Handle url = NewString(TestCase::url());
   Dart_Handle source = NewString(kScriptChars);
   result = Dart_SetLibraryTagHandler(library_handler);
   EXPECT_VALID(result);
   Dart_Handle lib = Dart_LoadScript(url, source, 0, 0);
   EXPECT_VALID(lib);
   EXPECT(Dart_IsLibrary(lib));
   result = Dart_SetNativeResolver(lib, &MyStaticNativeClosureResolver, NULL);
   EXPECT_VALID(result);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   result = Dart_Invoke(lib, NewString("testMain"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   int64_t value = 0;
   EXPECT_VALID(Dart_IntegerToInt64(result, &value));
   EXPECT_EQ(0, value);
 }
 
 
@@ skipping 656 matching lines @@
   // Create a test library and Load up a test script in it.
   Dart_Handle lib1 = TestCase::LoadTestScript(kLoadFirst, NULL);
   Dart_Handle dart_args[1];
   dart_args[0] = Dart_NewInteger(0);
   result = Dart_Invoke(lib1, NewString("start"), 1, dart_args);
   EXPECT_VALID(result);
 
   Dart_Handle source = NewString(kLoadSecond);
   Dart_Handle url = NewString(TestCase::url());
   Dart_LoadSource(TestCase::lib(), url, source);
+  result = Dart_FinalizeLoading(false);
+  EXPECT_VALID(result);
 
   dart_args[0] = Dart_NewInteger(1);
   result = Dart_Invoke(lib1, NewString("start"), 1, dart_args);
   EXPECT_VALID(result);
 }
 
 
 // Test external strings and optimized code.
 static void ExternalStringDeoptimize_Finalize(void* peer) {
   delete[] reinterpret_cast<char*>(peer);
@@ skipping 190 matching lines @@
                                    NewString("main"),
                                    1,
                                    dart_args);
   int64_t value = 0;
   result = Dart_IntegerToInt64(result, &value);
   EXPECT_VALID(result);
   EXPECT_EQ(6, value);
 }
 
 }  // namespace dart