Remove relocation lock.

src/hydrogen-instructions.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1566 matching lines @@
 
 
 void HCheckMaps::SetSideEffectDominator(GVNFlag side_effect,
                                         HValue* dominator) {
   ASSERT(side_effect == kChangesMaps);
   // TODO(mstarzinger): For now we specialize on HStoreNamedField, but once
   // type information is rich enough we should generalize this to any HType
   // for which the map is known.
   if (HasNoUses() && dominator->IsStoreNamedField()) {
     HStoreNamedField* store = HStoreNamedField::cast(dominator);
-    Handle<Map> map = store->transition();
-    if (map.is_null() || store->object() != value()) return;
+    Address map_address_ = store->transition_raw_address();
+    if (map_address_ == NULL || store->object() != value()) return;
     for (int i = 0; i < map_set()->length(); i++) {
-      if (map.is_identical_to(map_set()->at(i))) {
+      if (map_address_ == map_raw_addresses_.at(i)) {
         DeleteAndReplaceWith(NULL);
         return;
       }
     }
   }
 }
 
 
 void HLoadElements::PrintDataTo(StringStream* stream) {
   value()->PrintNameTo(stream);
@@ skipping 442 matching lines @@
   double roundtrip_value = static_cast<double>(static_cast<int32_t>(value));
   return BitCast<int64_t>(roundtrip_value) == BitCast<int64_t>(value);
 }
 
 
 HConstant::HConstant(Handle<Object> handle, Representation r)
   : handle_(handle),
     has_int32_value_(false),
     has_double_value_(false),
     is_internalized_string_(false),
-    boolean_value_(handle->BooleanValue()) {
+    boolean_value_(handle->BooleanValue()),
+    raw_address_(NULL) {
   if (handle_->IsNumber()) {
     double n = handle_->Number();
     has_int32_value_ = IsInteger32(n);
     int32_value_ = DoubleToInt32(n);
     double_value_ = n;
     has_double_value_ = true;
   } else {
     type_from_value_ = HType::TypeFromValue(handle_);
     is_internalized_string_ = handle_->IsInternalizedString();
   }
   if (r.IsNone()) {
     if (has_int32_value_) {
       r = Representation::Integer32();
     } else if (has_double_value_) {
       r = Representation::Double();
     } else {
       r = Representation::Tagged();
     }
   }
   Initialize(r);
 }
 
 
 HConstant::HConstant(Handle<Object> handle,
+                     Address raw_address,
                      Representation r,
                      HType type,
                      bool is_internalize_string,
                      bool boolean_value)
     : handle_(handle),
       has_int32_value_(false),
       has_double_value_(false),
       is_internalized_string_(is_internalize_string),
       boolean_value_(boolean_value),
+      raw_address_(raw_address),
       type_from_value_(type) {
   ASSERT(!handle.is_null());
   ASSERT(!type.IsUninitialized());
   ASSERT(!type.IsTaggedNumber());
   Initialize(r);
 }
 
 
 HConstant::HConstant(int32_t integer_value,
                      Representation r,
                      Handle<Object> optional_handle)
-    : has_int32_value_(true),
+    : handle_(optional_handle),
+      has_int32_value_(true),
       has_double_value_(true),
       is_internalized_string_(false),
       boolean_value_(integer_value != 0),
       int32_value_(integer_value),
       double_value_(FastI2D(integer_value)) {
   Initialize(r);
 }
 
 
 HConstant::HConstant(double double_value,
                      Representation r,
                      Handle<Object> optional_handle)
-    : has_int32_value_(IsInteger32(double_value)),
+    : handle_(optional_handle),
+      has_int32_value_(IsInteger32(double_value)),
       has_double_value_(true),
       is_internalized_string_(false),
       boolean_value_(double_value != 0 && !isnan(double_value)),
       int32_value_(DoubleToInt32(double_value)),
       double_value_(double_value) {
   Initialize(r);
 }
 
 
 void HConstant::Initialize(Representation r) {
   set_representation(r);
   SetFlag(kUseGVN);
   if (representation().IsInteger32()) {
     ClearGVNFlag(kDependsOnOsrEntries);
   }
 }
 
 
 HConstant* HConstant::CopyToRepresentation(Representation r, Zone* zone) const {
   if (r.IsInteger32() && !has_int32_value_) return NULL;
   if (r.IsDouble() && !has_double_value_) return NULL;
   if (has_int32_value_) return new(zone) HConstant(int32_value_, r, handle_);
   if (has_double_value_) return new(zone) HConstant(double_value_, r, handle_);
   ASSERT(!handle_.is_null());
-  return new(zone) HConstant(
-      handle_, r, type_from_value_, is_internalized_string_, boolean_value_);
+  ASSERT_NE(NULL, raw_address_);
+  return new(zone) HConstant(handle_,
+                             raw_address_,
+                             r,
+                             type_from_value_,
+                             is_internalized_string_,
+                             boolean_value_);
 }
 
 
 HConstant* HConstant::CopyToTruncatedInt32(Zone* zone) const {
   if (has_int32_value_) {
     return new(zone) HConstant(
         int32_value_, Representation::Integer32(), handle_);
   }
   if (has_double_value_) {
     return new(zone) HConstant(
@@ skipping 304 matching lines @@
 }
 
 
 HLoadNamedFieldPolymorphic::HLoadNamedFieldPolymorphic(HValue* context,
                                                        HValue* object,
                                                        SmallMapList* types,
                                                        Handle<String> name,
                                                        Zone* zone)
     : types_(Min(types->length(), kMaxLoadPolymorphism), zone),
       name_(name),
+      types_raw_address_(0, zone),
+      name_raw_address_(NULL),
       need_generic_(false) {
   SetOperandAt(0, context);
   SetOperandAt(1, object);
   set_representation(Representation::Tagged());
   SetGVNFlag(kDependsOnMaps);
   SmallMapList negative_lookups;
   for (int i = 0;
        i < types->length() && types_.length() < kMaxLoadPolymorphism;
        ++i) {
     Handle<Map> map = types->at(i);
@@ skipping 46 matching lines @@
     // We don't have an easy way to handle both a call (to the generic stub) and
     // a deopt in the same hydrogen instruction, so in this case we don't add
     // the negative lookups which can deopt - just let the generic stub handle
     // them.
     SetAllSideEffects();
     need_generic_ = true;
   }
 }
 
 
+void HCheckMaps::FinalizeUniqueId() {
+  // Raw addresses may have already been collected.

[Sven Panne, 2013/04/16 06:43:44]

I don't understand this comment here and elsewhere.

+  if (map_raw_addresses_.is_empty()) {
+    Zone* zone = block()->zone();
+    map_raw_addresses_.Initialize(map_set_.length(), zone);
+    for (int i = 0; i < map_set_.length(); i++) {
+      map_raw_addresses_.Add(
+          reinterpret_cast<Address>(*map_set_.at(i)), zone);
+    }
+  }
+  ASSERT_EQ(map_set_.length(), map_raw_addresses_.length());
+}
+
+
+void HLoadNamedFieldPolymorphic::FinalizeUniqueId() {
+  // Raw addresses may have already been collected.
+  if (types_raw_address_.is_empty()) {
+    Zone* zone = block()->zone();
+    types_raw_address_.Initialize(types_.length(), zone);
+    for (int i = 0; i < types_.length(); i++) {
+      types_raw_address_.Add(reinterpret_cast<Address>(*types_.at(i)), zone);
+    }
+  }
+  ASSERT_EQ(types_.length(), types_raw_address_.length());
+  ASSERT(name_raw_address_ == NULL ||
+         name_raw_address_ == reinterpret_cast<Address>(*name_));
+  name_raw_address_ = reinterpret_cast<Address>(*name_);
+}
+
+
 bool HLoadNamedFieldPolymorphic::DataEquals(HValue* value) {
+  ASSERT_EQ(types_.length(), types_raw_address_.length());
+  ASSERT_NE(NULL, name_raw_address_);
   HLoadNamedFieldPolymorphic* other = HLoadNamedFieldPolymorphic::cast(value);
-  if (types_.length() != other->types()->length()) return false;
-  if (!name_.is_identical_to(other->name())) return false;
+  if (types_raw_address_.length() != other->types_raw_address_.length()) {
+    return false;
+  }
+  if (name_raw_address_ != name_raw_address_) return false;
   if (need_generic_ != other->need_generic_) return false;
-  for (int i = 0; i < types_.length(); i++) {
+  for (int i = 0; i < types_raw_address_.length(); i++) {
     bool found = false;
-    for (int j = 0; j < types_.length(); j++) {
-      if (types_.at(j).is_identical_to(other->types()->at(i))) {
+    for (int j = 0; j < types_raw_address_.length(); j++) {
+      if (types_raw_address_.at(j) == other->types_raw_address_.at(i)) {
         found = true;
         break;
       }
     }
     if (!found) return false;
   }
   return true;
 }
 
 
@@ skipping 986 matching lines @@
 
 
 void HCheckFunction::Verify() {
   HInstruction::Verify();
   ASSERT(HasNoUses());
 }
 
 #endif
 
 } }  // namespace v8::internal