Rename src/float.h to src/boxed-float.h

Apparently the name float.h causes problems on Windows when V8 is compiled with Visual Studio, see the bug description. R=clemensh@chromium.org Bug: v8:6588 Change-Id: Iaa9c1e93e62509a779f1a8ddecbb03a53981cf8a Reviewed-on: https://chromium-review.googlesource.com/578029 Reviewed-by: Michael Starzinger <mstarzinger@chromium.org> Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Commit-Queue: Andreas Haas <ahaas@chromium.org> Cr-Commit-Position: refs/heads/master@{#46791}
v8 · Jul 20, 2017 · 5f1157d · 5f1157d
1 parent 4037ad6
commit 5f1157d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -1175,6 +1175,7 @@ v8_source_set("v8_base") {
     "src/bit-vector.h",
     "src/bootstrapper.cc",
     "src/bootstrapper.h",
+    "src/boxed-float.h",
     "src/builtins/builtins-api.cc",
     "src/builtins/builtins-array.cc",
     "src/builtins/builtins-arraybuffer.cc",
@@ -1532,7 +1533,6 @@ v8_source_set("v8_base") {
     "src/flag-definitions.h",
     "src/flags.cc",
     "src/flags.h",
-    "src/float.h",
     "src/frames-inl.h",
     "src/frames.cc",
     "src/frames.h",

diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h
@@ -45,8 +45,8 @@
 
 #include "src/arm/constants-arm.h"
 #include "src/assembler.h"
+#include "src/boxed-float.h"
 #include "src/double.h"
-#include "src/float.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/float.h → src/boxed-float.h b/src/float.h → src/boxed-float.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef V8_FLOAT32_H_
-#define V8_FLOAT32_H_
+#ifndef V8_BOXED_FLOAT_H_
+#define V8_BOXED_FLOAT_H_
 
 #include "src/base/macros.h"
 
@@ -54,4 +54,4 @@ class Float64 {
 }  // namespace internal
 }  // namespace v8
 
-#endif  // V8_FLOAT32_H_
+#endif  // V8_BOXED_FLOAT_H_
diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc
@@ -6,13 +6,13 @@
 
 #include "src/arm/macro-assembler-arm.h"
 #include "src/assembler-inl.h"
+#include "src/boxed-float.h"
 #include "src/compilation-info.h"
 #include "src/compiler/code-generator-impl.h"
 #include "src/compiler/gap-resolver.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/osr.h"
 #include "src/double.h"
-#include "src/float.h"
 #include "src/heap/heap-inl.h"
 
 namespace v8 {

diff --git a/src/deoptimizer.h b/src/deoptimizer.h
@@ -6,8 +6,8 @@
 #define V8_DEOPTIMIZER_H_
 
 #include "src/allocation.h"
+#include "src/boxed-float.h"
 #include "src/deoptimize-reason.h"
-#include "src/float.h"
 #include "src/macro-assembler.h"
 #include "src/source-position.h"
 #include "src/zone/zone-chunk-list.h"

diff --git a/src/v8.gyp b/src/v8.gyp
@@ -619,6 +619,7 @@
         'bit-vector.h',
         'bootstrapper.cc',
         'bootstrapper.h',
+        'boxed-float.h',
         'builtins/builtins-api.cc',
         'builtins/builtins-arraybuffer.cc',
         'builtins/builtins-array.cc',
@@ -976,7 +977,6 @@
         'flag-definitions.h',
         'flags.cc',
         'flags.h',
-        'float.h',
         'frames-inl.h',
         'frames.cc',
         'frames.h',

diff --git a/test/cctest/test-disasm-arm.cc b/test/cctest/test-disasm-arm.cc
@@ -29,11 +29,11 @@
 #include <stdlib.h>
 
 #include "src/assembler-inl.h"
+#include "src/boxed-float.h"
 #include "src/debug/debug.h"
 #include "src/disasm.h"
 #include "src/disassembler.h"
 #include "src/double.h"
-#include "src/float.h"
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
 #include "src/v8.h"