Merged r14509 into trunk branch.

MIPS: Allow setting debugger breakpoints on CompareNilICs

R=jkummerow@chromium.org
BUG=

Review URL: https://codereview.chromium.org/14664003

git-svn-id: http://v8.googlecode.com/svn/trunk@14510 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/mips/debug-mips.cc b/src/mips/debug-mips.cc
index 3be1e4d..0ae0187 100644
--- a/src/mips/debug-mips.cc
+++ b/src/mips/debug-mips.cc
@@ -236,6 +236,15 @@
 }
 
 
+void Debug::GenerateCompareNilICDebugBreak(MacroAssembler* masm) {
+  // Register state for CompareNil IC
+  // ----------- S t a t e -------------
+  //  -- a0    : value
+  // -----------------------------------
+  Generate_DebugBreakCallHelper(masm, a0.bit(), 0);
+}
+
+
 void Debug::GenerateCallICDebugBreak(MacroAssembler* masm) {
   // Calling convention for IC call (from ic-mips.cc).
   // ----------- S t a t e -------------
diff --git a/src/version.cc b/src/version.cc
index 28094f2..4b5347c 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     18
 #define BUILD_NUMBER      5
-#define PATCH_LEVEL       1
+#define PATCH_LEVEL       2
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0