From b6c5c5b50dc1561180c061febfc6eebb0df1ed18 Mon Sep 17 00:00:00 2001 From: "mikhail.naganov@gmail.com" Date: Thu, 16 Sep 2010 08:17:46 +0000 Subject: [PATCH] Fix x64 compilation error. Patch from tfarina@chromium.org http://codereview.chromium.org/3442004/show git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5466 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/x64/code-stubs-x64.cc | 2 +- src/x64/macro-assembler-x64.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc index 13ad828..9d82e0e 100644 --- a/src/x64/code-stubs-x64.cc +++ b/src/x64/code-stubs-x64.cc @@ -1989,7 +1989,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { __ j(negative, &done); // Read the value from the static offsets vector buffer and make it a smi. __ movl(rdi, Operand(rcx, rdx, times_int_size, 0)); - __ Integer32ToSmi(rdi, rdi, &runtime); + __ Integer32ToSmi(rdi, rdi); // Store the smi value in the last match info. __ movq(FieldOperand(rbx, rdx, diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc index 7a237c3..e6f81b3 100644 --- a/src/x64/macro-assembler-x64.cc +++ b/src/x64/macro-assembler-x64.cc @@ -1,4 +1,4 @@ -// Copyright 2009 the V8 project authors. All rights reserved. +// Copyright 2010 the V8 project authors. All rights reserved. // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: @@ -1015,7 +1015,6 @@ void MacroAssembler::SmiSub(Register dst, const Operand& src2) { // No overflow checking. Use only when it's known that // overflowing is impossible (e.g., subtracting two positive smis). - ASSERT(!dst.is(src2)); if (dst.is(src1)) { subq(dst, src2); } else { -- 2.7.4