Reworked previous CL (ExternalStringGetPeer speed up) to avoid the

runtime/vm/raw_object.h

 // 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.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 1105 matching lines @@
     return peer_;
   }
 
  private:
   const T* data_;
   void* peer_;
   Dart_PeerFinalizer callback_;
 };
 
 
-DART_EXTERN_C {
-  Dart_Handle Dart_ExternalStringGetPeer(Dart_Handle, void**);
-}
-
-
 class RawExternalOneByteString : public RawString {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalOneByteString);
 
   ExternalStringData<uint8_t>* external_data_;
-  friend Dart_Handle Dart_ExternalStringGetPeer(Dart_Handle, void**);
+
+ public:
+  void* peer() {
+    return external_data_->peer();
+  }

[siva, 2012/08/29 19:39:11]

We generally try to restrict this file to just have data and avoid any functions
here.
RawObject is a special case as it is used by GC and Snapshot code.

[Tom Ball, 2012/08/29 20:03:50]

Ivan helped me rework the original code to avoid needing these, so they're gone
now.

On 2012/08/29 19:39:11, asiva wrote:

 };
 
 
 class RawExternalTwoByteString : public RawString {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalTwoByteString);
 
   ExternalStringData<uint16_t>* external_data_;
-  friend Dart_Handle Dart_ExternalStringGetPeer(Dart_Handle, void**);
+
+ public:
+  void* peer() {
+    return external_data_->peer();
+  }
 };
 
 
 class RawExternalFourByteString : public RawString {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalFourByteString);
 
   ExternalStringData<uint32_t>* external_data_;
-  friend Dart_Handle Dart_ExternalStringGetPeer(Dart_Handle, void**);
+
+ public:
+  void* peer() {
+    return external_data_->peer();
+  }
 };
 
 
 class RawBool : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Bool);
 
   bool value_;
 };
 
 
@@ skipping 426 matching lines @@
          kExternalUint64ArrayCid == kByteArrayCid + 18 &&
          kExternalFloat32ArrayCid == kByteArrayCid + 19 &&
          kExternalFloat64ArrayCid == kByteArrayCid + 20 &&
          kStacktraceCid == kByteArrayCid + 21);
   return (index >= kByteArrayCid && index <= kExternalFloat64ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_