Revert "A64: Now that we have veneers, fix a couple of branches to directly jump to their target."

src/arm64/regexp-macro-assembler-arm64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1463 matching lines @@
     if (to == NULL) {
       Backtrack();
       return;
     }
     __ B(to);
     return;
   }
   if (to == NULL) {
     to = &backtrack_label_;
   }
-  __ B(condition, to);
+  // TODO(ulan): do direct jump when jump distance is known and fits in imm19.
+  Condition inverted_condition = InvertCondition(condition);
+  Label no_branch;
+  __ B(inverted_condition, &no_branch);
+  __ B(to);
+  __ Bind(&no_branch);
 }
 
 void RegExpMacroAssemblerARM64::CompareAndBranchOrBacktrack(Register reg,
                                                             int immediate,
                                                             Condition condition,
                                                             Label* to) {
   if ((immediate == 0) && ((condition == eq) || (condition == ne))) {
     if (to == NULL) {
       to = &backtrack_label_;
     }
+    // TODO(ulan): do direct jump when jump distance is known and fits in imm19.
+    Label no_branch;
     if (condition == eq) {
-      __ Cbz(reg, to);
+      __ Cbnz(reg, &no_branch);
     } else {
-      __ Cbnz(reg, to);
+      __ Cbz(reg, &no_branch);
     }
+    __ B(to);
+    __ Bind(&no_branch);
   } else {
     __ Cmp(reg, immediate);
     BranchOrBacktrack(condition, to);
   }
 }
 
 
 void RegExpMacroAssemblerARM64::CheckPreemption() {
   // Check for preemption.
   ExternalReference stack_limit =
@@ skipping 200 matching lines @@
       __ Ldrh(current_character(), MemOperand(input_end(), offset, SXTW));
     }
   }
 }
 
 #endif  // V8_INTERPRETED_REGEXP
 
 }}  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM64