Reviewers: Kevin Millikin, Description: Merge bleeding_e...@2002 to trunk.
Please review this at http://codereview.chromium.org/115537 SVN Base: http://v8.googlecode.com/svn/trunk/ Affected files: M src/arm/virtual-frame-arm.h M src/ia32/virtual-frame-ia32.h M src/version.cc Index: src/ia32/virtual-frame-ia32.h =================================================================== --- src/ia32/virtual-frame-ia32.h (revision 2002) +++ src/ia32/virtual-frame-ia32.h (working copy) @@ -375,20 +375,20 @@ ZoneList<FrameElement> elements_; // The number of frame-allocated locals and parameters respectively. - int16_t parameter_count_; - int16_t local_count_; + int parameter_count_; + int local_count_; // The index of the element that is at the processor's stack pointer // (the esp register). - int16_t stack_pointer_; + int stack_pointer_; // The index of the element that is at the processor's frame pointer // (the ebp register). - int16_t frame_pointer_; + int frame_pointer_; // The index of the register frame element using each register, or // kIllegalIndex if a register is not on the frame. - int16_t register_locations_[kNumRegisters]; + int register_locations_[kNumRegisters]; // The index of the first parameter. The receiver lies below the first // parameter. Index: src/arm/virtual-frame-arm.h =================================================================== --- src/arm/virtual-frame-arm.h (revision 2002) +++ src/arm/virtual-frame-arm.h (working copy) @@ -354,20 +354,20 @@ ZoneList<FrameElement> elements_; // The number of frame-allocated locals and parameters respectively. - int16_t parameter_count_; - int16_t local_count_; + int parameter_count_; + int local_count_; // The index of the element that is at the processor's stack pointer // (the sp register). - int16_t stack_pointer_; + int stack_pointer_; // The index of the element that is at the processor's frame pointer // (the fp register). - int16_t frame_pointer_; + int frame_pointer_; // The index of the register frame element using each register, or // kIllegalIndex if a register is not on the frame. - int16_t register_locations_[kNumRegisters]; + int register_locations_[kNumRegisters]; // The index of the first parameter. The receiver lies below the first // parameter. Index: src/version.cc =================================================================== --- src/version.cc (revision 2002) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 2 #define BUILD_NUMBER 4 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
