Reviewers: Michael Starzinger,
Message:
Committed patchset #1 manually as r21084 (presubmit successful).
Description:
Unbreak the build after r21083.
TBR=mstarzin...@chromium.org
Committed: https://code.google.com/p/v8/source/detail?r=21084
Please review this at https://codereview.chromium.org/266493003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+11, -8 lines):
M src/arm/codegen-arm.cc
M src/arm/lithium-arm.h
M src/arm64/lithium-arm64.h
M src/ia32/lithium-ia32.h
M src/mips/lithium-mips.h
M src/platform-posix.cc
M src/x64/lithium-x64.h
Index: src/arm/codegen-arm.cc
diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
index
83437936a9e77583d828a6d27bd1dc87829f7562..7ac14e382a525fbb02f2963b0fd54c145cf9829a
100644
--- a/src/arm/codegen-arm.cc
+++ b/src/arm/codegen-arm.cc
@@ -238,11 +238,12 @@ OS::MemCopyUint8Function CreateMemCopyUint8Function(
// Convert 8 to 16. The number of character to copy must be at least 8.
OS::MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
- OS::MemCopyUint16Uint8Function stub) {
+ bool serializer_enabled,
+ OS::MemCopyUint16Uint8Function stub) {
#if defined(USE_SIMULATOR)
return stub;
#else
- if (Serializer::enabled() |
| !CpuFeatures::IsSupported(UNALIGNED_ACCESSES)) {
+ if (serializer_enabled || !CpuFeatures::IsSupported(UNALIGNED_ACCESSES))
{
return stub;
}
size_t actual_size;
Index: src/arm/lithium-arm.h
diff --git a/src/arm/lithium-arm.h b/src/arm/lithium-arm.h
index
a77b2df5ce82cdc8e380271eb5366fd205538090..c22d79f7f8d0e78cfd4028289e66162ed13088b4
100644
--- a/src/arm/lithium-arm.h
+++ b/src/arm/lithium-arm.h
@@ -239,7 +239,7 @@ class LInstruction : public ZoneObject {
// Interface to the register allocator and iterators.
bool ClobbersTemps() const { return IsCall(); }
bool ClobbersRegisters() const { return IsCall(); }
- virtual bool ClobbersDoubleRegisters(Isolate* isolate) const V8_OVERRIDE
{
+ virtual bool ClobbersDoubleRegisters(Isolate* isolate) const {
return IsCall();
}
Index: src/arm64/lithium-arm64.h
diff --git a/src/arm64/lithium-arm64.h b/src/arm64/lithium-arm64.h
index
589d9aa2dcfa27bb565ac9b543fee5f9717ff99c..1fc831f1d002d29cf4bb56479c88eb4b6213c1ab
100644
--- a/src/arm64/lithium-arm64.h
+++ b/src/arm64/lithium-arm64.h
@@ -247,7 +247,7 @@ class LInstruction : public ZoneObject {
// Interface to the register allocator and iterators.
bool ClobbersTemps() const { return IsCall(); }
bool ClobbersRegisters() const { return IsCall(); }
- virtual bool ClobbersDoubleRegisters(Isolate* isolate) const V8_OVERRIDE
{
+ virtual bool ClobbersDoubleRegisters(Isolate* isolate) const {
return IsCall();
}
bool IsMarkedAsCall() const { return IsCall(); }
Index: src/ia32/lithium-ia32.h
diff --git a/src/ia32/lithium-ia32.h b/src/ia32/lithium-ia32.h
index
7bcf3a81668a114ff92746d952ab82178e0903ab..df718c7330e5cffb392aa65662be4428bae48f96
100644
--- a/src/ia32/lithium-ia32.h
+++ b/src/ia32/lithium-ia32.h
@@ -238,7 +238,7 @@ class LInstruction : public ZoneObject {
// Interface to the register allocator and iterators.
bool ClobbersTemps() const { return IsCall(); }
bool ClobbersRegisters() const { return IsCall(); }
- virtual bool ClobbersDoubleRegisters(Isolate* isolate) const V8_OVERRIDE
{
+ virtual bool ClobbersDoubleRegisters(Isolate* isolate) const {
return IsCall() ||
// We only have rudimentary X87Stack tracking, thus in general
// cannot handle phi-nodes.
Index: src/mips/lithium-mips.h
diff --git a/src/mips/lithium-mips.h b/src/mips/lithium-mips.h
index
49b929cc56aa221a361a11ec2668f92e020ce8c7..7a0e359e2d68842407a40f167b31c0c8c713e5cf
100644
--- a/src/mips/lithium-mips.h
+++ b/src/mips/lithium-mips.h
@@ -236,7 +236,7 @@ class LInstruction : public ZoneObject {
// Interface to the register allocator and iterators.
bool ClobbersTemps() const { return IsCall(); }
bool ClobbersRegisters() const { return IsCall(); }
- virtual bool ClobbersDoubleRegisters(Isolate* isolate) const V8_OVERRIDE
{
+ virtual bool ClobbersDoubleRegisters(Isolate* isolate) const {
return IsCall();
}
Index: src/platform-posix.cc
diff --git a/src/platform-posix.cc b/src/platform-posix.cc
index
4dc9aab687e63dc5681c47968623b88d632cc391..01eb6392a009e427d8d4ac4197eae30b4b4f6366
100644
--- a/src/platform-posix.cc
+++ b/src/platform-posix.cc
@@ -517,6 +517,7 @@ OS::MemCopyUint8Function CreateMemCopyUint8Function(
bool serializer_enabled,
OS::MemCopyUint8Function stub);
OS::MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
+ bool serializer_enabled,
OS::MemCopyUint16Uint8Function stub);
#elif defined(V8_HOST_ARCH_MIPS)
@@ -538,7 +539,8 @@ void OS::PostSetUp(bool serializer_enabled) {
OS::memcopy_uint8_function =
CreateMemCopyUint8Function(serializer_enabled,
&OS::MemCopyUint8Wrapper);
OS::memcopy_uint16_uint8_function =
- CreateMemCopyUint16Uint8Function(&OS::MemCopyUint16Uint8Wrapper);
+ CreateMemCopyUint16Uint8Function(serializer_enabled,
+ &OS::MemCopyUint16Uint8Wrapper);
#elif defined(V8_HOST_ARCH_MIPS)
OS::memcopy_uint8_function =
CreateMemCopyUint8Function(serializer_enabled,
&OS::MemCopyUint8Wrapper);
Index: src/x64/lithium-x64.h
diff --git a/src/x64/lithium-x64.h b/src/x64/lithium-x64.h
index
222248bfe4b026668044f94de3de44e322dc4660..ad8413818b11d94289ac997fbc8feb5059747cfd
100644
--- a/src/x64/lithium-x64.h
+++ b/src/x64/lithium-x64.h
@@ -234,7 +234,7 @@ class LInstruction : public ZoneObject {
// Interface to the register allocator and iterators.
bool ClobbersTemps() const { return IsCall(); }
bool ClobbersRegisters() const { return IsCall(); }
- virtual bool ClobbersDoubleRegisters(Isolate* isolate) const V8_OVERRIDE
{
+ virtual bool ClobbersDoubleRegisters(Isolate* isolate) const {
return IsCall();
}
--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
