Rollback of previous commit -- still under review.

runtime/vm/dart_api_impl.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 "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 1507 matching lines @@
   }
   CHECK_LENGTH(length, String::kMaxElements);
   return Api::NewHandle(isolate, String::New(codepoints, length));
 }
 
 
 DART_EXPORT bool Dart_IsExternalString(Dart_Handle object) {
   return RawObject::IsExternalStringClassId(Api::ClassId(object));
 }
 
+
 DART_EXPORT Dart_Handle Dart_ExternalStringGetPeer(Dart_Handle object,
                                                    void** peer) {
+  Isolate* isolate = Isolate::Current();
+  DARTSCOPE(isolate);
+  const String& str = Api::UnwrapStringHandle(isolate, object);
+  if (str.IsNull()) {
+    RETURN_TYPE_ERROR(isolate, object, String);
+  }
+  if (!str.IsExternal()) {
+    return
+        Api::NewError("%s expects argument 'object' to be an external String.",
+                      CURRENT_FUNC);
+  }
   if (peer == NULL) {
     RETURN_NULL_ERROR(peer);
   }
-//  NoGCScope no_gc_scope;
-  if (Dart_IsExternalString(object)) {
-    Isolate* isolate = Isolate::Current();
-    intptr_t class_id = Api::ClassId(object);
-    void* raw_peer ;
-    switch (class_id) {
-      case kExternalOneByteStringCid: {
-        asm("");
-        RawExternalOneByteString* raw_string =
-            (*(reinterpret_cast<RawExternalOneByteString**>(object)))->ptr();
-        ExternalStringData<uint8_t>* data = raw_string->external_data_;
-        raw_peer = data != NULL ? data->peer() : NULL;
-        break;
-      }
-      case kExternalTwoByteStringCid: {
-        RawExternalTwoByteString* raw_string =
-            (*(reinterpret_cast<RawExternalTwoByteString**>(object)))->ptr();
-        ExternalStringData<uint16_t>* data = raw_string->external_data_;
-        raw_peer = data != NULL ? data->peer() : NULL;
-        break;
-      }
-      default: {
-        RawExternalFourByteString* raw_string =
-            (*(reinterpret_cast<RawExternalFourByteString**>(object)))->ptr();
-        ExternalStringData<uint32_t>* data = raw_string->external_data_;
-        raw_peer = data != NULL ? data->peer() : NULL;
-        break;
-      }
-    }
-    if (raw_peer != NULL) {
-      *peer = raw_peer;
-      return Api::Success(isolate);
-    } else {
-      RETURN_TYPE_ERROR(isolate, object, String);
-    }
-  }
-  const char* error_msg = Dart_IsString(object) ?
-      "%s expects argument 'object' to be an external String." :
-      "%s expects argument 'object' to be of type String.";
-  return Api::NewError(error_msg, CURRENT_FUNC);
+  *peer = str.GetPeer();
+  return Api::Success(isolate);
 }
 
 
 DART_EXPORT Dart_Handle Dart_NewExternalString8(const uint8_t* codepoints,
                                                 intptr_t length,
                                                 void* peer,
                                                 Dart_PeerFinalizer callback) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   if (codepoints == NULL && length != 0) {
@@ skipping 2574 matching lines @@
 DART_EXPORT void Dart_InitPerfEventsSupport(Dart_FileWriterFunction function) {
   Dart::set_perf_events_writer(function);
 }
 
 
 DART_EXPORT void Dart_InitFlowGraphPrinting(Dart_FileWriterFunction function) {
   Dart::set_flow_graph_writer(function);
 }
 
 }  // namespace dart