Revert of Version 4.4.63.20 (cherry-pick)

src/arm/assembler-arm.cc

Index: src/arm/assembler-arm.cc
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
index 7560dfe566801320c19c8c7765bd5632b11f0a9d..da1ab68a76d0ae1bf47d35444df3f51524ad314a 100644
--- a/src/arm/assembler-arm.cc
+++ b/src/arm/assembler-arm.cc
@@ -1298,7 +1298,7 @@
 }
 
 
-int Assembler::branch_offset(Label* L) {
+int Assembler::branch_offset(Label* L, bool jump_elimination_allowed) {
   int target_pos;
   if (L->is_bound()) {
     target_pos = L->pos();
@@ -1364,24 +1364,6 @@
   positions_recorder()->WriteRecordedPositions();
   DCHECK(!target.is(pc));  // use of pc is actually allowed, but discouraged
   emit(cond | B24 | B21 | 15*B16 | 15*B12 | 15*B8 | BX | target.code());
-}
-
-
-void Assembler::b(Label* L, Condition cond) {
-  CheckBuffer();
-  b(branch_offset(L), cond);
-}
-
-
-void Assembler::bl(Label* L, Condition cond) {
-  CheckBuffer();
-  bl(branch_offset(L), cond);
-}
-
-
-void Assembler::blx(Label* L) {
-  CheckBuffer();
-  blx(branch_offset(L));
 }
 
 
@@ -3789,7 +3771,10 @@
     RecordConstPool(size);
 
     // Emit jump over constant pool if necessary.
-    if (require_jump) b(size - kPcLoadDelta);
+    Label after_pool;
+    if (require_jump) {
+      b(&after_pool);
+    }
 
     // Put down constant pool marker "Undefined instruction".
     // The data size helps disassembly know what to print.
@@ -3896,6 +3881,10 @@
     first_const_pool_64_use_ = -1;
 
     RecordComment("]");
+
+    if (after_pool.is_linked()) {
+      bind(&after_pool);
+    }
   }
 
   // Since a constant pool was just emitted, move the check offset forward by