Revision: 21084
Author:   [email protected]
Date:     Wed Apr 30 10:24:03 2014 UTC
Log:      Unbreak the build after r21083.

[email protected]

Review URL: https://codereview.chromium.org/266493003
http://code.google.com/p/v8/source/detail?r=21084

Modified:
 /branches/bleeding_edge/src/arm/codegen-arm.cc
 /branches/bleeding_edge/src/arm/lithium-arm.h
 /branches/bleeding_edge/src/arm64/lithium-arm64.h
 /branches/bleeding_edge/src/ia32/lithium-ia32.h
 /branches/bleeding_edge/src/mips/lithium-mips.h
 /branches/bleeding_edge/src/platform-posix.cc
 /branches/bleeding_edge/src/x64/lithium-x64.h

=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.cc Wed Apr 30 09:50:58 2014 UTC +++ /branches/bleeding_edge/src/arm/codegen-arm.cc Wed Apr 30 10:24:03 2014 UTC
@@ -238,11 +238,12 @@

 // 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;
=======================================
--- /branches/bleeding_edge/src/arm/lithium-arm.h Wed Apr 30 09:50:58 2014 UTC +++ /branches/bleeding_edge/src/arm/lithium-arm.h Wed Apr 30 10:24:03 2014 UTC
@@ -239,7 +239,7 @@
   // 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();
   }

=======================================
--- /branches/bleeding_edge/src/arm64/lithium-arm64.h Wed Apr 30 09:50:58 2014 UTC +++ /branches/bleeding_edge/src/arm64/lithium-arm64.h Wed Apr 30 10:24:03 2014 UTC
@@ -247,7 +247,7 @@
   // 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(); }
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-ia32.h Wed Apr 30 09:50:58 2014 UTC +++ /branches/bleeding_edge/src/ia32/lithium-ia32.h Wed Apr 30 10:24:03 2014 UTC
@@ -238,7 +238,7 @@
   // 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.
=======================================
--- /branches/bleeding_edge/src/mips/lithium-mips.h Wed Apr 30 09:50:58 2014 UTC +++ /branches/bleeding_edge/src/mips/lithium-mips.h Wed Apr 30 10:24:03 2014 UTC
@@ -236,7 +236,7 @@
   // 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();
   }

=======================================
--- /branches/bleeding_edge/src/platform-posix.cc Wed Apr 30 09:50:58 2014 UTC +++ /branches/bleeding_edge/src/platform-posix.cc Wed Apr 30 10:24:03 2014 UTC
@@ -517,6 +517,7 @@
     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 @@
   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);
=======================================
--- /branches/bleeding_edge/src/x64/lithium-x64.h Wed Apr 30 09:50:58 2014 UTC +++ /branches/bleeding_edge/src/x64/lithium-x64.h Wed Apr 30 10:24:03 2014 UTC
@@ -234,7 +234,7 @@
   // 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
[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.

Reply via email to