Merge r5333, r5336, r5341 to 2.2 branch...

src/x64/debug-x64.cc

Index: src/x64/debug-x64.cc
===================================================================
--- src/x64/debug-x64.cc	(revision 5348)
+++ src/x64/debug-x64.cc	(working copy)
@@ -100,12 +100,11 @@
 
 
 void Debug::GenerateCallICDebugBreak(MacroAssembler* masm) {
-  // Register state for keyed IC call call (from ic-x64.cc)
+  // Register state for IC call call (from ic-x64.cc)
   // ----------- S t a t e -------------
-  //  -- rax: number of arguments
+  //  -- rcx: function name
   // -----------------------------------
-  // The number of arguments in rax is not smi encoded.
-  Generate_DebugBreakCallHelper(masm, 0, false);
+  Generate_DebugBreakCallHelper(masm, rcx.bit(), false);
 }