Revision: 6814
Author: [email protected]
Date: Wed Feb 16 05:09:41 2011
Log: Merge revision 6578 to the 3.0 branch, fixing x64 debug build.
This is a one character change to fix the x64 build on the 3.0 branch.
Review URL: http://codereview.chromium.org/6480114
http://code.google.com/p/v8/source/detail?r=6814
Modified:
/branches/3.0/src/version.cc
/branches/3.0/src/x64/lithium-x64.cc
=======================================
--- /branches/3.0/src/version.cc Wed Feb 16 01:11:23 2011
+++ /branches/3.0/src/version.cc Wed Feb 16 05:09:41 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 0
#define BUILD_NUMBER 12
-#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
=======================================
--- /branches/3.0/src/x64/lithium-x64.cc Wed Feb 2 07:49:30 2011
+++ /branches/3.0/src/x64/lithium-x64.cc Wed Feb 16 05:09:41 2011
@@ -653,7 +653,7 @@
LInstruction*
LChunkBuilder::SetInstructionPendingDeoptimizationEnvironment(
LInstruction* instr, int ast_id) {
- ASSERT(instructions_pending_deoptimization_environment_ == NULL);
+ ASSERT(instruction_pending_deoptimization_environment_ == NULL);
ASSERT(pending_deoptimization_ast_id_ == AstNode::kNoNumber);
instruction_pending_deoptimization_environment_ = instr;
pending_deoptimization_ast_id_ = ast_id;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
