Fix issues with Arm's use of embedded constant pools

src/assembler.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // 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.
 //
@@ skipping 1796 matching lines @@
 }
 
 
 // Emit and return position of pool.  Zero implies no constant pool.
 int ConstantPoolBuilder::Emit(Assembler* assm) {
   bool emitted = emitted_label_.is_bound();
   bool empty = IsEmpty();
 
   if (!emitted) {
     // Mark start of constant pool.  Align if necessary.
-    if (!empty) assm->Align(kDoubleSize);
+    if (!empty) assm->DataAlign(kDoubleSize);
     assm->bind(&emitted_label_);
     if (!empty) {
       // Emit in groups based on access and type.
       // Emit doubles first for alignment purposes.
       EmitGroup(assm, ConstantPoolEntry::REGULAR, ConstantPoolEntry::DOUBLE);
       EmitGroup(assm, ConstantPoolEntry::REGULAR, ConstantPoolEntry::INTPTR);
       if (info_[ConstantPoolEntry::DOUBLE].overflow()) {
-        assm->Align(kDoubleSize);
+        assm->DataAlign(kDoubleSize);
         EmitGroup(assm, ConstantPoolEntry::OVERFLOWED,
                   ConstantPoolEntry::DOUBLE);
       }
       if (info_[ConstantPoolEntry::INTPTR].overflow()) {
         EmitGroup(assm, ConstantPoolEntry::OVERFLOWED,
                   ConstantPoolEntry::INTPTR);
       }
     }
   }
 
@@ skipping 28 matching lines @@
   EnsureSpace ensure_space(this);
   RecordRelocInfo(RelocInfo::JS_RETURN);
 }
 
 
 void Assembler::RecordDebugBreakSlot() {
   positions_recorder()->WriteRecordedPositions();
   EnsureSpace ensure_space(this);
   RecordRelocInfo(RelocInfo::DEBUG_BREAK_SLOT);
 }
+
+
+void Assembler::DataAlign(int m) {
+  DCHECK(m >= 2 && base::bits::IsPowerOfTwo32(m));
+  while ((pc_offset() & (m - 1)) != 0) {
+    db(0);
+  }
+}
 }  // namespace internal
 }  // namespace v8