aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorweiliang.lin@intel.com <weiliang.lin@intel.com>2014-11-10 09:08:28 +0000
committerweiliang.lin@intel.com <weiliang.lin@intel.com>2014-11-10 09:08:48 +0000
commitae4728945755838c8d6450f0a344eb4b583c4dd5 (patch)
tree02a746f74f797cb064f5fdd9156213b7c404d8b6
parent79390123903f4a8b6e973f2d4e3743948b97aeb8 (diff)
downloadv8-ae4728945755838c8d6450f0a344eb4b583c4dd5.tar.gz
Version 3.29.88.17 (merged r25226)
X87: fix one GC issue caused by x87 crankshaft. R=jkummerow@chromium.org BUG= Review URL: https://codereview.chromium.org/712933002 Cr-Commit-Position: refs/branch-heads/3.29@{#25232} git-svn-id: https://v8.googlecode.com/svn/branches/3.29@25232 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
-rw-r--r--src/version.cc2
-rw-r--r--src/x87/lithium-codegen-x87.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/version.cc b/src/version.cc
index 461a65362..a6c529e36 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 29
#define BUILD_NUMBER 88
-#define PATCH_LEVEL 16
+#define PATCH_LEVEL 17
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
diff --git a/src/x87/lithium-codegen-x87.cc b/src/x87/lithium-codegen-x87.cc
index 75bf0a9e0..a5bc5eae0 100644
--- a/src/x87/lithium-codegen-x87.cc
+++ b/src/x87/lithium-codegen-x87.cc
@@ -4060,8 +4060,8 @@ void LCodeGen::DoMathSqrt(LMathSqrt* instr) {
__ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
__ push(temp_result);
__ CallRuntimeSaveDoubles(Runtime::kMathSqrtRT);
- RecordSafepointWithRegisters(
- instr->pointer_map(), 0, Safepoint::kNoLazyDeopt);
+ RecordSafepointWithRegisters(instr->pointer_map(), 1,
+ Safepoint::kNoLazyDeopt);
__ StoreToSafepointRegisterSlot(temp_result, eax);
}
X87PrepareToWrite(result_reg);
@@ -4275,7 +4275,7 @@ void LCodeGen::DoMathExp(LMathExp* instr) {
__ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
__ push(temp_result);
__ CallRuntimeSaveDoubles(Runtime::kMathExpRT);
- RecordSafepointWithRegisters(instr->pointer_map(), 0,
+ RecordSafepointWithRegisters(instr->pointer_map(), 1,
Safepoint::kNoLazyDeopt);
__ StoreToSafepointRegisterSlot(temp_result, eax);
}