- Fix a couple near branches that were out of reach.

vm/code_generator_x64.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 1422 matching lines @@
     // already been checked above (if the type is instantiated). So we can
     // return false here if the instance is null (and if the type is
     // instantiated).
     // We can only inline this null check if the type is instantiated at compile
     // time, since an uninstantiated type at compile time could be Object or
     // Dynamic at run time.
     Label non_null;
     __ cmpq(RAX, raw_null);
     __ j(NOT_EQUAL, &non_null, Assembler::kNearJump);
     __ PushObject(negate_result ? bool_true : bool_false);
-    __ jmp(&done, Assembler::kNearJump);
+    __ jmp(&done);
 
     __ Bind(&non_null);
 
     const Class& type_class = Class::ZoneHandle(type.type_class());
     const bool requires_type_arguments = type_class.HasTypeArguments();
     // A Smi object cannot be the instance of a parameterized class.
     // A class equality check is only applicable with a dst type of a
     // non-parameterized class or with a raw dst type of a parameterized class.
     if (requires_type_arguments) {
       const AbstractTypeArguments& type_arguments =
           AbstractTypeArguments::Handle(type.arguments());
       const bool is_raw_type = type_arguments.IsNull() ||
           type_arguments.IsDynamicTypes(type_arguments.Length());
       Label runtime_call;
       __ testq(RAX, Immediate(kSmiTagMask));
       __ j(ZERO, &runtime_call, Assembler::kNearJump);
       // Object not Smi.
       if (is_raw_type) {
         if (type.IsListInterface()) {
           Label push_result;
           // TODO(srdjan) also accept List<Object>.
           __ movq(RCX, FieldAddress(RAX, Object::class_offset()));
           __ CompareObject(RCX, *CoreClass("ObjectArray"));
           __ j(EQUAL, &push_result, Assembler::kNearJump);
           __ CompareObject(RCX, *CoreClass("GrowableObjectArray"));
           __ j(NOT_EQUAL, &runtime_call, Assembler::kNearJump);
           __ Bind(&push_result);
           __ PushObject(negate_result ? bool_false : bool_true);
-          __ jmp(&done, Assembler::kNearJump);
+          __ jmp(&done);
         } else if (!type_class.is_interface()) {
           __ movq(RCX, FieldAddress(RAX, Object::class_offset()));
           __ CompareObject(RCX, type_class);
           __ j(NOT_EQUAL, &runtime_call, Assembler::kNearJump);
           __ PushObject(negate_result ? bool_false : bool_true);
-          __ jmp(&done, Assembler::kNearJump);
+          __ jmp(&done);
         }
       }
       __ Bind(&runtime_call);
       // Fall through to runtime call.
     } else {
       Label compare_classes;
       __ testq(RAX, Immediate(kSmiTagMask));
       __ j(NOT_ZERO, &compare_classes, Assembler::kNearJump);
       // Object is Smi.
       const Class& smi_class = Class::Handle(Smi::Class());
       // TODO(regis): We should introduce a SmiType.
       if (smi_class.IsSubtypeOf(TypeArguments::Handle(),
                                 type_class,
                                 TypeArguments::Handle())) {
         __ PushObject(negate_result ? bool_false : bool_true);
       } else {
         __ PushObject(negate_result ? bool_true : bool_false);
       }
-      __ jmp(&done, Assembler::kNearJump);
+      __ jmp(&done);
 
       // Compare if the classes are equal.
       __ Bind(&compare_classes);
       const Class* compare_class = NULL;
       if (type.IsStringInterface()) {
         compare_class = &Class::ZoneHandle(
             Isolate::Current()->object_store()->one_byte_string_class());
       } else if (type.IsBoolInterface()) {
         compare_class = &Class::ZoneHandle(
             Isolate::Current()->object_store()->bool_class());
@@ skipping 1293 matching lines @@
                         message_buffer, kMessageBufferSize,
                         format, args);
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64