Revert "More compact string representation on 64 bit."

runtime/vm/intrinsifier_ia32.cc

Index: runtime/vm/intrinsifier_ia32.cc
diff --git a/runtime/vm/intrinsifier_ia32.cc b/runtime/vm/intrinsifier_ia32.cc
index 16d5209cef3d0d6a3396ef7951b617c9cd65c62f..13e47bdd0c2d142aa4b15efadf197c4f961ea8c7 100644
--- a/runtime/vm/intrinsifier_ia32.cc
+++ b/runtime/vm/intrinsifier_ia32.cc
@@ -212,9 +212,8 @@ void Intrinsifier::GrowableArray_add(Assembler* assembler) {
     /* only scale by 8. */                                                     \
     scale_factor = TIMES_8;                                                    \
   }                                                                            \
-  const intptr_t fixed_size_plus_alignment_padding =                           \
-      sizeof(Raw##type_name) + kObjectAlignment - 1;                           \
-  __ leal(EDI, Address(EDI, scale_factor, fixed_size_plus_alignment_padding)); \
+  const intptr_t fixed_size = sizeof(Raw##type_name) + kObjectAlignment - 1;   \
+  __ leal(EDI, Address(EDI, scale_factor, fixed_size));                        \
   __ andl(EDI, Immediate(-kObjectAlignment));                                  \
   Heap::Space space = Heap::kNew;                                              \
   __ movl(ECX, Address(THR, Thread::heap_offset()));                           \
@@ -2028,10 +2027,8 @@ static void TryAllocateOnebyteString(Assembler* assembler,
   Label pop_and_fail;
   __ pushl(EDI);  // Preserve length.
   __ SmiUntag(EDI);
-  const intptr_t fixed_size_plus_alignment_padding =
-      sizeof(RawString) + kObjectAlignment - 1;
-  __ leal(EDI, Address(EDI, TIMES_1,
-                       fixed_size_plus_alignment_padding));  // EDI is untagged.
+  const intptr_t fixed_size = sizeof(RawString) + kObjectAlignment - 1;
+  __ leal(EDI, Address(EDI, TIMES_1, fixed_size));  // EDI is untagged.
   __ andl(EDI, Immediate(-kObjectAlignment));
 
   const intptr_t cid = kOneByteStringCid;