Merge WebKit at r59636: Update v8 to r4660.
Will build and run with current webkit.
Change-Id: I57bae621fd894da363ba84e1757ad09eb7c502b9
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index a1976ec..f9b444b 100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -50,6 +50,11 @@
}
+void MacroAssembler::StoreRoot(Register source, Heap::RootListIndex index) {
+ movq(Operand(kRootRegister, index << kPointerSizeLog2), source);
+}
+
+
void MacroAssembler::PushRoot(Heap::RootListIndex index) {
push(Operand(kRootRegister, index << kPointerSizeLog2));
}
@@ -1227,8 +1232,7 @@
void MacroAssembler::SmiShiftLeftConstant(Register dst,
Register src,
- int shift_value,
- Label* on_not_smi_result) {
+ int shift_value) {
if (!dst.is(src)) {
movq(dst, src);
}
@@ -1240,8 +1244,7 @@
void MacroAssembler::SmiShiftLeft(Register dst,
Register src1,
- Register src2,
- Label* on_not_smi_result) {
+ Register src2) {
ASSERT(!dst.is(rcx));
Label result_ok;
// Untag shift amount.