- Merge function lists when patching classes (no more duplicates).

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 "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "platform/utils.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 5461 matching lines @@
   result_cstr = "";
   EXPECT_VALID(Dart_StringToCString(result, &result_cstr));
   EXPECT_STREQ("bar", result_cstr);
 }
 
 
 TEST_CASE(ParsePatchLibrary) {
   const char* kLibraryChars =
   "#library('patched_library');\n"
   "class A {\n"
+  "  final fvalue;\n"
   "  var _f;\n"
   "  callFunc(x, y) => x(y);\n"
   "  external method(var value);\n"
   "  get field() => _field;\n"
   "}\n"
   "external int unpatched();\n"
   "external int topLevel(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 method(var value) {\n"
   "    int closeYourEyes(var eggs) { return eggs * -1; }\n"
   "    value = callFunc(closeYourEyes, value);\n"
   "    _g = value * 5;\n"
   "  }\n"
   "}\n"
   "var _topLevelValue = -1;\n"
   "patch int topLevel(var value) => value * value;\n"
   "patch int set topLevelSetter(value) { _topLevelValue = value; }\n"
@@ skipping 35 matching lines @@
   if (!err.IsNull()) {
     OS::Print("Patching error: %s\n", err.ToErrorCString());
     EXPECT(false);
   }
 
   Dart_Handle script_url = Dart_NewString("theScript");
   source = Dart_NewString(kScriptChars);
   Dart_Handle test_script = Dart_LoadScript(script_url, source);
   EXPECT_VALID(test_script);
 
+  // Make sure that we can compile all of the patched code.
+  result = Dart_CompileAll();
+  EXPECT_VALID(result);
+
   result = Dart_Invoke(test_script, Dart_NewString("e1"), 0, NULL);
   EXPECT_ERROR(result, "External implementation missing");
 
   int64_t value = 0;
   result = Dart_Invoke(test_script, Dart_NewString("m1"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   EXPECT_VALID(Dart_IntegerToInt64(result, &value));
   EXPECT_EQ(4, value);
 
@@ skipping 1026 matching lines @@
   EXPECT(Dart_IsString(str));
   len = -1;
   EXPECT_VALID(Dart_StringLength(str, &len));
   EXPECT_EQ(0, len);
 }
 
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart