1.1 --- a/src/Environments.h	Sun Aug 05 01:28:12 2012 -0700
     1.2 +++ b/src/Environments.h	Sun Aug 05 01:45:37 2012 -0700
     1.3 @@ -44,7 +44,7 @@
     1.4      static Environment *New(Zone *zone, Handle<EnvironmentMap> map, Heap::Tenure tenure = Heap::Tenure_Default);
     1.5  
     1.6      inline EnvironmentMap *map();
     1.7 -    inline size_t size();
     1.8 +    inline size_t objSize();
     1.9  
    1.10      float getFloat(unsigned slot) {
    1.11          return *pointerToSlot<float>(slot);
    1.12 @@ -99,9 +99,8 @@
    1.13      unsigned length() {
    1.14          return length_;
    1.15      }
    1.16 -    unsigned size() {
    1.17 -        return Align(sizeof(*this) + length() * sizeof(EnvironmentSlotDescriptorArray),
    1.18 -                     kObjectAlignment);
    1.19 +    unsigned objSize() {
    1.20 +        return sizeof(*this) + length() * sizeof(EnvironmentSlotDescriptorArray);
    1.21      }
    1.22  
    1.23      static inline EnvironmentSlotDescriptorArray *cast(Object *obj) {
    1.24 @@ -128,8 +127,8 @@
    1.25      const unsigned *traceOffsets() {
    1.26          return reinterpret_cast<unsigned *>(this + 1);
    1.27      }
    1.28 -    size_t size() {
    1.29 -        return Align(sizeof(EnvironmentMap) + sizeof(unsigned) * traceOffsetCount(), kObjectAlignment);
    1.30 +    size_t objSize() {
    1.31 +        return sizeof(EnvironmentMap) + sizeof(unsigned) * traceOffsetCount();
    1.32      }
    1.33      EnvironmentSlotDescriptor &slotDescriptor(unsigned slot) {
    1.34          return slots_->at(slot);
    1.35 @@ -148,9 +147,9 @@
    1.36  };
    1.37  
    1.38  size_t
    1.39 -Environment::size()
    1.40 +Environment::objSize()
    1.41  {
    1.42 -    return Align(sizeof(Environment) + map()->structureSize(), kObjectAlignment);
    1.43 +    return sizeof(Environment) + map()->structureSize();
    1.44  }
    1.45  
    1.46  EnvironmentMap *