Index: src/crankshaft/hydrogen.cc |
diff --git a/src/hydrogen.cc b/src/crankshaft/hydrogen.cc |
similarity index 99% |
rename from src/hydrogen.cc |
rename to src/crankshaft/hydrogen.cc |
index d9b63d9aea7702d6755572f11fae2e7f2b7d0e6f..8cb139cb8c735a5460a9eb661548c264e16026fd 100644 |
--- a/src/hydrogen.cc |
+++ b/src/crankshaft/hydrogen.cc |
@@ -2,63 +2,63 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "src/hydrogen.h" |
+#include "src/crankshaft/hydrogen.h" |
#include <sstream> |
#include "src/allocation-site-scopes.h" |
#include "src/ast-numbering.h" |
#include "src/code-factory.h" |
+#include "src/crankshaft/hydrogen-bce.h" |
+#include "src/crankshaft/hydrogen-bch.h" |
+#include "src/crankshaft/hydrogen-canonicalize.h" |
+#include "src/crankshaft/hydrogen-check-elimination.h" |
+#include "src/crankshaft/hydrogen-dce.h" |
+#include "src/crankshaft/hydrogen-dehoist.h" |
+#include "src/crankshaft/hydrogen-environment-liveness.h" |
+#include "src/crankshaft/hydrogen-escape-analysis.h" |
+#include "src/crankshaft/hydrogen-gvn.h" |
+#include "src/crankshaft/hydrogen-infer-representation.h" |
+#include "src/crankshaft/hydrogen-infer-types.h" |
+#include "src/crankshaft/hydrogen-load-elimination.h" |
+#include "src/crankshaft/hydrogen-mark-deoptimize.h" |
+#include "src/crankshaft/hydrogen-mark-unreachable.h" |
+#include "src/crankshaft/hydrogen-osr.h" |
+#include "src/crankshaft/hydrogen-range-analysis.h" |
+#include "src/crankshaft/hydrogen-redundant-phi.h" |
+#include "src/crankshaft/hydrogen-removable-simulates.h" |
+#include "src/crankshaft/hydrogen-representation-changes.h" |
+#include "src/crankshaft/hydrogen-sce.h" |
+#include "src/crankshaft/hydrogen-store-elimination.h" |
+#include "src/crankshaft/hydrogen-uint32-analysis.h" |
+#include "src/crankshaft/lithium-allocator.h" |
+#include "src/crankshaft/typing.h" |
#include "src/full-codegen/full-codegen.h" |
-#include "src/hydrogen-bce.h" |
-#include "src/hydrogen-bch.h" |
-#include "src/hydrogen-canonicalize.h" |
-#include "src/hydrogen-check-elimination.h" |
-#include "src/hydrogen-dce.h" |
-#include "src/hydrogen-dehoist.h" |
-#include "src/hydrogen-environment-liveness.h" |
-#include "src/hydrogen-escape-analysis.h" |
-#include "src/hydrogen-gvn.h" |
-#include "src/hydrogen-infer-representation.h" |
-#include "src/hydrogen-infer-types.h" |
-#include "src/hydrogen-load-elimination.h" |
-#include "src/hydrogen-mark-deoptimize.h" |
-#include "src/hydrogen-mark-unreachable.h" |
-#include "src/hydrogen-osr.h" |
-#include "src/hydrogen-range-analysis.h" |
-#include "src/hydrogen-redundant-phi.h" |
-#include "src/hydrogen-removable-simulates.h" |
-#include "src/hydrogen-representation-changes.h" |
-#include "src/hydrogen-sce.h" |
-#include "src/hydrogen-store-elimination.h" |
-#include "src/hydrogen-uint32-analysis.h" |
#include "src/ic/call-optimization.h" |
#include "src/ic/ic.h" |
// GetRootConstructor |
#include "src/ic/ic-inl.h" |
#include "src/isolate-inl.h" |
-#include "src/lithium-allocator.h" |
#include "src/parser.h" |
#include "src/runtime/runtime.h" |
#include "src/scopeinfo.h" |
-#include "src/typing.h" |
#if V8_TARGET_ARCH_IA32 |
-#include "src/ia32/lithium-codegen-ia32.h" // NOLINT |
+#include "src/crankshaft/ia32/lithium-codegen-ia32.h" // NOLINT |
#elif V8_TARGET_ARCH_X64 |
-#include "src/x64/lithium-codegen-x64.h" // NOLINT |
+#include "src/crankshaft/x64/lithium-codegen-x64.h" // NOLINT |
#elif V8_TARGET_ARCH_ARM64 |
-#include "src/arm64/lithium-codegen-arm64.h" // NOLINT |
+#include "src/crankshaft/arm64/lithium-codegen-arm64.h" // NOLINT |
#elif V8_TARGET_ARCH_ARM |
-#include "src/arm/lithium-codegen-arm.h" // NOLINT |
+#include "src/crankshaft/arm/lithium-codegen-arm.h" // NOLINT |
#elif V8_TARGET_ARCH_PPC |
-#include "src/ppc/lithium-codegen-ppc.h" // NOLINT |
+#include "src/crankshaft/ppc/lithium-codegen-ppc.h" // NOLINT |
#elif V8_TARGET_ARCH_MIPS |
-#include "src/mips/lithium-codegen-mips.h" // NOLINT |
+#include "src/crankshaft/mips/lithium-codegen-mips.h" // NOLINT |
#elif V8_TARGET_ARCH_MIPS64 |
-#include "src/mips64/lithium-codegen-mips64.h" // NOLINT |
+#include "src/crankshaft/mips64/lithium-codegen-mips64.h" // NOLINT |
#elif V8_TARGET_ARCH_X87 |
-#include "src/x87/lithium-codegen-x87.h" // NOLINT |
+#include "src/crankshaft/x87/lithium-codegen-x87.h" // NOLINT |
#else |
#error Unsupported target architecture. |
#endif |
@@ -4429,7 +4429,7 @@ void HOptimizedGraphBuilder::VisitForTypeOf(Expression* expr) { |
void HOptimizedGraphBuilder::VisitForControl(Expression* expr, |
HBasicBlock* true_block, |
HBasicBlock* false_block) { |
- TestContext for_test(this, expr, true_block, false_block); |
+ TestContext for_control(this, expr, true_block, false_block); |
Visit(expr); |
} |