Failed to apply patch for src/mips/code-stubs-mips.cc:
While running git apply --index -3 -p1;
error: patch failed: src/mips/code-stubs-mips.cc:857
Falling back to three-way merge...
Applied patch to 'src/mips/code-stubs-mips.cc' with conflicts.
U src/mips/code-stubs-mips.cc
Patch: src/mips/code-stubs-mips.cc
Index: src/mips/code-stubs-mips.cc
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
index
6d7892d5c3f3434f1803981264d09f39a3e70729..97eed7470725f5ab2c1cb194ab78da0e25dfabaa
100644
--- a/src/mips/code-stubs-mips.cc
+++ b/src/mips/code-stubs-mips.cc
@@ -1,8 +1,6 @@
// Copyright 2012 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
-#include <limits>
#include "src/v8.h"
@@ -857,7 +855,7 @@
// double_scratch can be overwritten in the delay slot.
// Calculates square root of base. Check for the special case of
// Math.pow(-Infinity, 0.5) == Infinity (ECMA spec, 15.8.2.13).
- __ Move(double_scratch, std::numeric_limits<double>::infinity());
+ __ Move(double_scratch, static_cast<double>(-V8_INFINITY));
__ BranchF(USE_DELAY_SLOT, &done, NULL, eq, double_base,
double_scratch);
__ neg_d(double_result, double_scratch);
@@ -877,7 +875,7 @@
// double_scratch can be overwritten in the delay slot.
// Calculates square root of base. Check for the special case of
// Math.pow(-Infinity, -0.5) == 0 (ECMA spec, 15.8.2.13).
- __ Move(double_scratch, std::numeric_limits<double>::infinity());
+ __ Move(double_scratch, static_cast<double>(-V8_INFINITY));
__ BranchF(USE_DELAY_SLOT, &done, NULL, eq, double_base,
double_scratch);
__ Move(double_result, kDoubleRegZero);
https://codereview.chromium.org/813813003/
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
