Add missing StorePointer/StoreSmi in ContextScope.

runtime/vm/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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 4161 matching lines @@
         sizeof(RawContextScope) + (len * kBytesPerElement));
   }
 
   static RawContextScope* New(intptr_t num_variables);
 
  private:
   void set_num_variables(intptr_t num_variables) const {
     StoreNonPointer(&raw_ptr()->num_variables_, num_variables);
   }
 
-  RawContextScope::VariableDesc* VariableDescAddr(intptr_t index) const {
+  const RawContextScope::VariableDesc* VariableDescAddr(intptr_t index) const {
     ASSERT((index >= 0) && (index < num_variables()));
-    uword raw_addr = reinterpret_cast<uword>(raw_ptr());
-    raw_addr += sizeof(RawContextScope) +
-        (index * sizeof(RawContextScope::VariableDesc));
-    return reinterpret_cast<RawContextScope::VariableDesc*>(raw_addr);
+    return raw_ptr()->VariableDescAddr(index);
   }
 
   FINAL_HEAP_OBJECT_IMPLEMENTATION(ContextScope, Object);
   friend class Class;
 };
 
 
 class MegamorphicCache : public Object {
  public:
   static const int kInitialCapacity = 16;
@@ skipping 3353 matching lines @@
 
 
 RawObject* MegamorphicCache::GetTargetFunction(const Array& array,
                                                intptr_t index) {
   return array.At((index * kEntryLength) + kTargetFunctionIndex);
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_