--debug-code: sanity-checking instrumentation for Lithium object accesses

src/hydrogen.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/hydrogen.h"
 
 #include <algorithm>
 
 #include "src/v8.h"
 #include "src/allocation-site-scopes.h"
@@ skipping 8833 matching lines @@
     }
 
     HAllocate* receiver = BuildAllocate(
         size_in_bytes, HType::JSObject(), JS_OBJECT_TYPE, allocation_mode);
     receiver->set_known_initial_map(initial_map);
 
     // Initialize map and fields of the newly allocated object.
     { NoObservableSideEffectsScope no_effects(this);
       ASSERT(initial_map->instance_type() == JS_OBJECT_TYPE);
       Add<HStoreNamedField>(receiver,
-          HObjectAccess::ForMapAndOffset(initial_map, JSObject::kMapOffset),
-          Add<HConstant>(initial_map));
+                            HObjectAccess::ForMap(),
+                            Add<HConstant>(initial_map));
       HValue* empty_fixed_array = Add<HConstant>(factory->empty_fixed_array());
       Add<HStoreNamedField>(receiver,
-          HObjectAccess::ForMapAndOffset(initial_map,
-                                         JSObject::kPropertiesOffset),
-          empty_fixed_array);
+                            HObjectAccess::ForPropertiesPointer(),
+                            empty_fixed_array);
       Add<HStoreNamedField>(receiver,
-          HObjectAccess::ForMapAndOffset(initial_map,
-                                         JSObject::kElementsOffset),
-          empty_fixed_array);
+                            HObjectAccess::ForElementsPointer(),
+                            empty_fixed_array);
       if (initial_map->inobject_properties() != 0) {
         HConstant* undefined = graph()->GetConstantUndefined();
         for (int i = 0; i < initial_map->inobject_properties(); i++) {
           int property_offset = initial_map->GetInObjectPropertyOffset(i);
           Add<HStoreNamedField>(receiver,
               HObjectAccess::ForMapAndOffset(initial_map, property_offset),
               undefined);
         }
       }
     }
@@ skipping 1607 matching lines @@
   PretenureFlag pretenure_flag = NOT_TENURED;
   if (FLAG_allocation_site_pretenuring) {
     pretenure_flag = site_context->current()->GetPretenureMode();
     Handle<AllocationSite> site(site_context->current());
     AllocationSite::AddDependentCompilationInfo(
         site, AllocationSite::TENURING, top_info());
   }
 
   HInstruction* object = Add<HAllocate>(object_size_constant, type,
       pretenure_flag, instance_type, site_context->current());
+  BuildEmitObjectHeader(boilerplate_object, object);
 
   // If allocation folding reaches Page::kMaxRegularHeapObjectSize the
   // elements array may not get folded into the object. Hence, we set the
   // elements pointer to empty fixed array and let store elimination remove
   // this store in the folding case.
   HConstant* empty_fixed_array = Add<HConstant>(
       isolate()->factory()->empty_fixed_array());
   Add<HStoreNamedField>(object, HObjectAccess::ForElementsPointer(),
       empty_fixed_array);
 
-  BuildEmitObjectHeader(boilerplate_object, object);
-
   Handle<FixedArrayBase> elements(boilerplate_object->elements());
   int elements_size = (elements->length() > 0 &&
       elements->map() != isolate()->heap()->fixed_cow_array_map()) ?
           elements->Size() : 0;
 
   if (pretenure_flag == TENURED &&
       elements->map() == isolate()->heap()->fixed_cow_array_map() &&
       isolate()->heap()->InNewSpace(*elements)) {
     // If we would like to pretenure a fixed cow array, we must ensure that the
     // array is already in old space, otherwise we'll create too many old-to-
@@ skipping 1524 matching lines @@
   if (ShouldProduceTraceOutput()) {
     isolate()->GetHTracer()->TraceHydrogen(name(), graph_);
   }
 
 #ifdef DEBUG
   graph_->Verify(false);  // No full verify.
 #endif
 }
 
 } }  // namespace v8::internal