Merge r8520 and 8717 into 3.2 branch, fixing a SplitConstantsInFullCompiler cctest.

test/cctest/test-compiler.cc

Index: test/cctest/test-compiler.cc
===================================================================
--- test/cctest/test-compiler.cc	(revision 8888)
+++ test/cctest/test-compiler.cc	(working copy)
@@ -375,10 +375,15 @@
 
     v8::internal::EmbeddedVector<char, 128> decode_buffer;
     while (pc < end) {
-      pc += d.InstructionDecode(decode_buffer, pc);
-      CHECK(strstr(decode_buffer.start(), "mov eax,0x178c29c") == NULL);
-      CHECK(strstr(decode_buffer.start(), "push 0x178c29c") == NULL);
-      CHECK(strstr(decode_buffer.start(), "0x178c29c") == NULL);
+      int num_const = d.ConstantPoolSizeAt(pc);
+      if (num_const >= 0) {
+        pc += (num_const + 1) * kPointerSize;
+      } else {
+        pc += d.InstructionDecode(decode_buffer, pc);
+        CHECK(strstr(decode_buffer.start(), "mov eax,0x178c29c") == NULL);
+        CHECK(strstr(decode_buffer.start(), "push 0x178c29c") == NULL);
+        CHECK(strstr(decode_buffer.start(), "0x178c29c") == NULL);
+      }
     }
   }
 }