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 1196 matching lines @@
     RawSmi* context_index;
     RawSmi* context_level;
   };
 
   int32_t num_variables_;
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->data()[0]);
   }
   // Variable length data follows here.
   RawObject** data() { OPEN_ARRAY_START(RawObject*, RawObject*); }

[Ivan Posva, 2014/10/29 05:17:27]

Should we have the non-const data() accessor in this class at all. When is it
ever needed apart in the from()/to() calculation?

[koda, 2014/10/29 20:10:27]

Changed from/to to use VariableDescAddr.

PTAL

+  RawObject* const* data() const { OPEN_ARRAY_START(RawObject*, RawObject*); }
+  const VariableDesc* VariableDescAddr(intptr_t index) const {

[Ivan Posva, 2014/10/29 05:17:27]

Why did you have to move this functionality to RawContextScope from
ContextScope?

[koda, 2014/10/29 20:10:27]

I wanted to keep the tricky representation details of the
struct/pointers/padding issues contained in this file. For instance, the person
addressing the above TODO will likely want to change VariableDescAddr too.

(And in the updated CL it's also needed for from/to.)

+    ASSERT((index >= 0) && (index < num_variables_));
+    // 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]);
   }
 };
 
 
 class RawICData : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ICData);
 
@@ skipping 840 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_