Add ObjectPool tag for external labels. Use LoadExternalLabel for native calls...

runtime/vm/assembler.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 "vm/assembler.h"
 
 #include "platform/utils.h"
 #include "vm/cpu.h"
 #include "vm/heap.h"
 #include "vm/memory_region.h"
@@ skipping 249 matching lines @@
     object_pool_index_table_.Insert(
         ObjIndexPair(entry, object_pool_.length() - 1));
   }
   return object_pool_.length() - 1;
 }
 
 
 intptr_t ObjectPoolWrapper::AddExternalLabel(const ExternalLabel* label,
                                              Patchability patchable) {
   return AddObject(ObjectPool::Entry(label->address(),
-                                     ObjectPool::kImmediate),
+                                     ObjectPool::kExternalLabel),
                    patchable);
 }
 
 
 intptr_t ObjectPoolWrapper::FindObject(ObjectPool::Entry entry,
                                        Patchability patchable) {
   // If the object is not patchable, check if we've already got it in the
   // object pool.
   if (patchable == kNotPatchable) {
     intptr_t idx = object_pool_index_table_.Lookup(entry);
@@ skipping 13 matching lines @@
 
 intptr_t ObjectPoolWrapper::FindImmediate(uword imm) {
   return FindObject(ObjectPool::Entry(imm, ObjectPool::kImmediate),
                     kNotPatchable);
 }
 
 
 intptr_t ObjectPoolWrapper::FindExternalLabel(const ExternalLabel* label,
                                               Patchability patchable) {
   return FindObject(ObjectPool::Entry(label->address(),
-                                      ObjectPool::kImmediate),
+                                      ObjectPool::kExternalLabel),
                     patchable);
 }
 
 
 RawObjectPool* ObjectPoolWrapper::MakeObjectPool() {
   intptr_t len = object_pool_.length();
   if (len == 0) {
     return Object::empty_object_pool().raw();
   }
   const ObjectPool& result = ObjectPool::Handle(ObjectPool::New(len));
   const TypedData& info_array = TypedData::Handle(result.info_array());
   for (intptr_t i = 0; i < len; ++i) {
     ObjectPool::EntryType info = object_pool_[i].type_;
     info_array.SetInt8(i, static_cast<int8_t>(info));
     if (info == ObjectPool::kTaggedObject) {
       result.SetObjectAt(i, *object_pool_[i].obj_);
     } else {
       result.SetRawValueAt(i, object_pool_[i].raw_value_);
     }
   }
   return result.raw();
 }
 
 
 }  // namespace dart