[vm] Roll back part of 2nd simarm_x64 CL that slowed benchmarks

liamappelbe · commit-bot@chromium.org · commit a1401e301557 · 2019-06-11T09:35:24.000Z
Rolls back part of https://dart-review.googlesource.com/c/sdk/+/104286 which caused many benchmark runtime regressions such as: https://golem.corp.goog/Benchmark?team=dart-vm&benchmark=DeltaBlue#targets%3Ddart%3BmachineTypes%3Dlinux-x64%3Bcpus%3DIntel%20Core%20i5 Culprit was ClassTable::StateOffsetFor(intptr_t cid), so this CL rolls back just that function to its old state. Bug: #36839 Bug: #37221 Change-Id: I6c369537d0fdaa8609dcd1f57efbaf518b8bf66c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/105550 Commit-Queue: Liam Appelbe <liama@google.com> Reviewed-by: Liam Appelbe <liama@google.com>
diff --git a/runtime/vm/compiler/runtime_api.cc b/runtime/vm/compiler/runtime_api.cc
@@ -458,10 +458,7 @@ word Context::variable_offset(word n) {
     return clazz##_elements_start_offset + index * clazz##_element_size;       \
   }
 
-#define DEFINE_ARRAY_STRUCTFIELD(clazz, name, element_offset, field_offset)    \
-  word clazz::name(intptr_t index) {                                           \
-    return element_offset(index) + field_offset;                               \
-  }
+#define DEFINE_ARRAY_STRUCTFIELD(clazz, name, element_offset, field_offset)
 
 #define DEFINE_SIZEOF(clazz, name, what)                                       \
   word clazz::name() { return clazz##_##name; }
@@ -556,6 +553,22 @@ bool CanLoadFromThread(const dart::Object& object,
   return false;
 }
 
+#if !defined(PRODUCT)
+word ClassTable::StateOffsetFor(intptr_t cid) {
+  return dart::ClassTable::StateOffsetFor(cid);
+}
+
+word ClassTable::NewSpaceCounterOffsetFor(intptr_t index) {
+  return ClassOffsetFor(index) +
+         ClassHeapStats::allocated_since_gc_new_space_offset();
+}
+
+word ClassTable::NewSpaceSizeOffsetFor(intptr_t index) {
+  return ClassOffsetFor(index) +
+         ClassHeapStats::allocated_size_since_gc_new_space_offset();
+}
+#endif  // !defined(PRODUCT)
+
 static_assert(
     kSmiBits <= dart::kSmiBits,
     "Expected that size of Smi on HOST is at least as large as on target.");
