Ported fix to Windows build problem.
Review URL: http://codereview.chromium.org/3077028
git-svn-id: http://v8.googlecode.com/svn/trunk@5214 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/ia32/codegen-ia32.cc b/src/ia32/codegen-ia32.cc
index 6ab0464..ba7785b 100644
--- a/src/ia32/codegen-ia32.cc
+++ b/src/ia32/codegen-ia32.cc
@@ -7594,9 +7594,7 @@
__ and_(Operand(tmp), right);
__ test(Operand(tmp), Immediate(kSmiTagMask));
destination()->false_target()->Branch(equal);
- __ mov(tmp, FieldOperand(left, HeapObject::kMapOffset));
- __ cmpb(FieldOperand(tmp, Map::kInstanceTypeOffset),
- static_cast<int8_t>(JS_REGEXP_TYPE));
+ __ CmpObjectType(left, JS_REGEXP_TYPE, tmp);
destination()->false_target()->Branch(not_equal);
__ cmp(tmp, FieldOperand(right, HeapObject::kMapOffset));
destination()->false_target()->Branch(not_equal);
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc
index d68d8cc..eb944e6 100644
--- a/src/ia32/full-codegen-ia32.cc
+++ b/src/ia32/full-codegen-ia32.cc
@@ -2696,9 +2696,7 @@
__ and_(Operand(tmp), right);
__ test(Operand(tmp), Immediate(kSmiTagMask));
__ j(zero, &fail);
- __ mov(tmp, FieldOperand(left, HeapObject::kMapOffset));
- __ cmpb(FieldOperand(tmp, Map::kInstanceTypeOffset),
- static_cast<int8_t>(JS_REGEXP_TYPE));
+ __ CmpObjectType(left, JS_REGEXP_TYPE, tmp);
__ j(not_equal, &fail);
__ cmp(tmp, FieldOperand(right, HeapObject::kMapOffset));
__ j(not_equal, &fail);
diff --git a/src/version.cc b/src/version.cc
index a0bb3b6..c542aef 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 3
#define BUILD_NUMBER 6
-#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