From 704c92ce955e20b90bf6ec2c94c26945c316108e Mon Sep 17 00:00:00 2001 From: "vegorov@chromium.org" Date: Thu, 19 Jan 2012 08:43:34 +0000 Subject: [PATCH] Ensure that LRandom restores rsi after call to the C function on x64. R=ulan@chromium.org BUG=http://crbug.com/110509 TEST=test/mjsunit/regress/regress-110509.js Review URL: https://chromiumcodereview.appspot.com/9265003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10434 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/x64/lithium-codegen-x64.cc | 1 + test/mjsunit/regress/regress-110509.js | 41 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 test/mjsunit/regress/regress-110509.js diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc index 291901e537..350ff6f4d7 100644 --- a/src/x64/lithium-codegen-x64.cc +++ b/src/x64/lithium-codegen-x64.cc @@ -2962,6 +2962,7 @@ void LCodeGen::DoRandom(LRandom* instr) { __ movq(global_object, FieldOperand(global_object, GlobalObject::kGlobalContextOffset)); __ CallCFunction(ExternalReference::random_uint32_function(isolate()), 1); + __ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); // Convert 32 random bits in rax to 0.(32 random bits) in a double // by computing: diff --git a/test/mjsunit/regress/regress-110509.js b/test/mjsunit/regress/regress-110509.js new file mode 100644 index 0000000000..132bd233be --- /dev/null +++ b/test/mjsunit/regress/regress-110509.js @@ -0,0 +1,41 @@ +// Copyright 2012 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: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Flags: --allow-natives-syntax + +// Verify that LRandom preserves rsi correctly. + +function foo() { + Math.random(); + new Function(""); +} + +foo(); +foo(); +foo(); +%OptimizeFunctionOnNextCall(foo); +foo();