Merge Label and NearLabel

src/x64/assembler-x64.h

Index: src/x64/assembler-x64.h
diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h
index 32db4b892b80c866f3170772ee16ae10da7f41ff..bef41c018959adc2e525f28ee37a5447ab9b475f 100644
--- a/src/x64/assembler-x64.h
+++ b/src/x64/assembler-x64.h
@@ -1178,6 +1178,7 @@ class Assembler : public AssemblerBase {
   // but it may be bound only once.
 
   void bind(Label* L);  // binds an unbound label L to the current code position
+  // DEPRECATED. Use bind(Label*) with jmp(Label*, Label::kNear) instead.
   void bind(NearLabel* L);
 
   // Calls
@@ -1202,7 +1203,7 @@ class Assembler : public AssemblerBase {
   // Jumps
   // Jump short or near relative.
   // Use a 32-bit signed displacement.
-  void jmp(Label* L);  // unconditional jump to L
+  void jmp(Label* L, bool near = Label::kFar);  // unconditional jump to L
   void jmp(Handle<Code> target, RelocInfo::Mode rmode);
 
   // Jump near absolute indirect (r64)
@@ -1212,13 +1213,15 @@ class Assembler : public AssemblerBase {
   void jmp(const Operand& src);
 
   // Short jump
+  // DEPRECATED. Use jmp(L, Label::kNear) instead.
   void jmp(NearLabel* L);
 
   // Conditional jumps
-  void j(Condition cc, Label* L);
+  void j(Condition cc, Label* L, bool near = Label::kFar, Hint hint = no_hint);
   void j(Condition cc, Handle<Code> target, RelocInfo::Mode rmode);
 
   // Conditional short jump
+  // DEPRECATED. Use jmp(L, Label::kNear) instead.
   void j(Condition cc, NearLabel* L, Hint hint = no_hint);
 
   // Floating-point operations