Changes per discussion with Anton

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 514 matching lines @@
   EXPECT_EQ(4, len);
 
   uint8_t data8[] = { 'o', 'n', 'e', 0x7F };
 
   Dart_Handle str8 = Dart_NewStringFromUTF8(data8, ARRAY_SIZE(data8));
   EXPECT_VALID(str8);
   EXPECT(Dart_IsString(str8));
   EXPECT(Dart_IsStringLatin1(str8));
   EXPECT(!Dart_IsExternalString(str8));
 
+  uint8_t latin1_array[] = {0, 0, 0, 0, 0};
+  len = 5;
+  Dart_Handle result = Dart_StringToLatin1(str8, latin1_array, &len);
+  EXPECT_VALID(result);
+  EXPECT_EQ(4, len);
+  EXPECT(latin1_array != NULL);
+  for (intptr_t i = 0; i < len; i++) {
+    EXPECT_EQ(data8[i], latin1_array[i]);
+  }
+
   Dart_Handle ext8 = Dart_NewExternalLatin1String(data8, ARRAY_SIZE(data8),
                                                   NULL, NULL);
   EXPECT_VALID(ext8);
   EXPECT(Dart_IsString(ext8));
   EXPECT(Dart_IsExternalString(ext8));
 
   uint16_t data16[] = { 't', 'w', 'o', 0xFFFF };
 
   Dart_Handle str16 = Dart_NewStringFromUTF16(data16, ARRAY_SIZE(data16));
   EXPECT_VALID(str16);
@@ skipping 6763 matching lines @@
     Dart_ExitScope();
   }
   EXPECT_EQ(40, peer8);
   EXPECT_EQ(41, peer16);
   Isolate::Current()->heap()->CollectGarbage(Heap::kNew);
   EXPECT_EQ(80, peer8);
   EXPECT_EQ(82, peer16);
 }
 
 
+TEST_CASE(ExternalizeConstantStrings) {
+  const char* kScriptChars =
+      "void testMain() {\n"
+      "  return 'constant string';\n"
+      "}\n";
+
+  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
+  Dart_Handle result = Dart_Invoke(lib,
+                                      NewString("testMain"),
+                                      0,
+                                      NULL);
+  const char* expected_str = "constant string";
+  const intptr_t kExpectedLen = 15;
+  int peer = 40;
+  uint8_t ext_str[kExpectedLen];
+  Dart_Handle str = Dart_MakeExternalString(result,
+                                            ext_str,
+                                            kExpectedLen,
+                                            &peer,
+                                            MakeExternalCback);
+
+  EXPECT(Dart_IsNull(str));
+  for (intptr_t i = 0; i < kExpectedLen; i++) {
+    EXPECT_EQ(expected_str[i], ext_str[i]);
+  }
+}
+
+
 TEST_CASE(LazyLoadDeoptimizes) {
   const char* kLoadFirst =
       "start(a) {\n"
       "  var obj = (a == 1) ? createB() : new A();\n"
       "  for (int i = 0; i < 4000; i++) {\n"
       "    var res = obj.foo();\n"
       "    if (a == 1) { if (res != 1) throw 'Error'; }\n"
       "    else if (res != 2) throw 'Error'; \n"
       "  }\n"
       "}\n"
@@ skipping 21 matching lines @@
   Dart_LoadSource(TestCase::lib(), url, source);
 
   dart_args[0] = Dart_NewInteger(1);
   result = Dart_Invoke(lib1, NewString("start"), 1, dart_args);
   EXPECT_VALID(result);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart