Add missing StorePointer/StoreSmi in ContextScope.

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/atomic.h"
 #include "vm/globals.h"
@@ skipping 1193 matching lines @@
       RawAbstractType* type;
       RawInstance* value;  // iff is_const is true
     };
     RawSmi* context_index;
     RawSmi* context_level;
   };
 
   int32_t num_variables_;
 
   RawObject** from() {
-    return reinterpret_cast<RawObject**>(&ptr()->data()[0]);
+    VariableDesc* begin = const_cast<VariableDesc*>(ptr()->VariableDescAddr(0));
+    return reinterpret_cast<RawObject**>(begin);
   }
   // Variable length data follows here.
-  RawObject** data() { OPEN_ARRAY_START(RawObject*, RawObject*); }
+  RawObject* const* data() const { OPEN_ARRAY_START(RawObject*, RawObject*); }
+  const VariableDesc* VariableDescAddr(intptr_t index) const {
+    ASSERT((index >= 0) && (index < num_variables_ + 1));
+    // data() points to the first component of the first descriptor.
+    return &(reinterpret_cast<const VariableDesc*>(data())[index]);
+  }
   RawObject** to(intptr_t num_vars) {
-    const intptr_t data_length = num_vars * (sizeof(VariableDesc)/kWordSize);
-    return reinterpret_cast<RawObject**>(&ptr()->data()[data_length - 1]);
+    VariableDesc* end =
+        const_cast<VariableDesc*>(ptr()->VariableDescAddr(num_vars));
+    // 'end' points at the first word beyond the last descriptor, so step back.
+    return reinterpret_cast<RawObject**>(end) - 1;

[Ivan Posva, 2014/11/07 00:18:12]

Pointer arithmetic?

   }
 };
 
 
 class RawICData : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ICData);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->owner_);
   }
@@ skipping 837 matching lines @@
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_