Reviewers: Vyacheslav Egorov, Description: Merge r7223 to 3.1 branch.
Fix presubmit error introduced by r7996, which was a merge of r7221. [email protected] Please review this at http://codereview.chromium.org/6992004/ SVN Base: http://v8.googlecode.com/svn/branches/3.1/ Affected files: M src/hydrogen-instructions.h M src/version.cc Index: src/hydrogen-instructions.h =================================================================== --- src/hydrogen-instructions.h (revision 8006) +++ src/hydrogen-instructions.h (working copy) @@ -791,7 +791,7 @@ class HDeoptimize: public HControlInstruction { public: - HDeoptimize(int environment_length) + explicit HDeoptimize(int environment_length) : HControlInstruction(NULL, NULL), values_(environment_length) { } Index: src/version.cc =================================================================== --- src/version.cc (revision 8007) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 1 #define BUILD_NUMBER 8 -#define PATCH_LEVEL 19 +#define PATCH_LEVEL 20 #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
