Remove grab-bag includes of v8.h from regexp engine.

R=yangguo@chromium.org

Review URL: https://codereview.chromium.org/1294783002

Cr-Commit-Position: refs/heads/master@{#30180}

diff --git a/src/regexp/arm/regexp-macro-assembler-arm.cc b/src/regexp/arm/regexp-macro-assembler-arm.cc
index b60a68eb648c1f17168680073846dd2511e02d96..d5020604401987680e7be2aae6c56104bdc7a5b2 100644 (file)
--- a/src/regexp/arm/regexp-macro-assembler-arm.cc
+++ b/src/regexp/arm/regexp-macro-assembler-arm.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_ARM
 
 #include "src/regexp/arm/regexp-macro-assembler-arm.h"

diff --git a/src/regexp/arm64/regexp-macro-assembler-arm64.cc b/src/regexp/arm64/regexp-macro-assembler-arm64.cc
index 91988450dfb710ac927fabf85ba8e5f2afff6351..ed24cf3401b17a26e5e9ee9eb5f16e802ebc63fd 100644 (file)
--- a/src/regexp/arm64/regexp-macro-assembler-arm64.cc
+++ b/src/regexp/arm64/regexp-macro-assembler-arm64.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_ARM64
 
 #include "src/regexp/arm64/regexp-macro-assembler-arm64.h"

diff --git a/src/regexp/ia32/regexp-macro-assembler-ia32.cc b/src/regexp/ia32/regexp-macro-assembler-ia32.cc
index 5003a8c485d496f80fef13f5cc869b29cbfd5f92..3ba5db14f247af40bcfab1b41d85b5eabe62982f 100644 (file)
--- a/src/regexp/ia32/regexp-macro-assembler-ia32.cc
+++ b/src/regexp/ia32/regexp-macro-assembler-ia32.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_IA32
 
 #include "src/regexp/ia32/regexp-macro-assembler-ia32.h"

diff --git a/src/regexp/interpreter-irregexp.cc b/src/regexp/interpreter-irregexp.cc
index 0d4d467db5831f77effbb1862e49100a479a68d7..afc31a3d57bbc86d122fba489bba2bb18675b86a 100644 (file)
--- a/src/regexp/interpreter-irregexp.cc
+++ b/src/regexp/interpreter-irregexp.cc
@@ -4,12 +4,10 @@
 
 // A simple interpreter for the Irregexp byte code.
 
-
-#include "src/v8.h"
+#include "src/regexp/interpreter-irregexp.h"
 
 #include "src/ast.h"
 #include "src/regexp/bytecodes-irregexp.h"
-#include "src/regexp/interpreter-irregexp.h"
 #include "src/regexp/jsregexp.h"
 #include "src/regexp/regexp-macro-assembler.h"
 #include "src/unicode.h"

diff --git a/src/regexp/interpreter-irregexp.h b/src/regexp/interpreter-irregexp.h
index 2aacec3e36fd62d2d92c9614d91aa0d552f89f7a..d97d3b0f17fcef527bc0d711d8d604c46d950324 100644 (file)
--- a/src/regexp/interpreter-irregexp.h
+++ b/src/regexp/interpreter-irregexp.h
@@ -7,6 +7,8 @@
 #ifndef V8_REGEXP_INTERPRETER_IRREGEXP_H_
 #define V8_REGEXP_INTERPRETER_IRREGEXP_H_
 
+#include "src/regexp/jsregexp.h"
+
 namespace v8 {
 namespace internal {
 

diff --git a/src/regexp/jsregexp.cc b/src/regexp/jsregexp.cc
index 3285f157758187b048bfabe6141c6d6ddc260693..aacaa1b9d3172574458039d055cb968b5c93935c 100644 (file)
--- a/src/regexp/jsregexp.cc
+++ b/src/regexp/jsregexp.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/regexp/jsregexp.h"
 
 #include "src/ast.h"

diff --git a/src/regexp/mips/regexp-macro-assembler-mips.cc b/src/regexp/mips/regexp-macro-assembler-mips.cc
index 8519a5337e594d2d0859671a4bb1893836ea5eec..77f09917c06026535608c0cae952f2546ef4579f 100644 (file)
--- a/src/regexp/mips/regexp-macro-assembler-mips.cc
+++ b/src/regexp/mips/regexp-macro-assembler-mips.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_MIPS
 
 #include "src/regexp/mips/regexp-macro-assembler-mips.h"

diff --git a/src/regexp/mips64/regexp-macro-assembler-mips64.cc b/src/regexp/mips64/regexp-macro-assembler-mips64.cc
index da96aa12e30decb32b6f77fea99ce70ee320f805..838fc68a802d17591e383d3e82f16c5552f6665e 100644 (file)
--- a/src/regexp/mips64/regexp-macro-assembler-mips64.cc
+++ b/src/regexp/mips64/regexp-macro-assembler-mips64.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_MIPS64
 
 #include "src/regexp/mips64/regexp-macro-assembler-mips64.h"

diff --git a/src/regexp/ppc/regexp-macro-assembler-ppc.cc b/src/regexp/ppc/regexp-macro-assembler-ppc.cc
index b0d356c1c32644f3cb3b7eb2739fabbfd5bf19be..e820aa9bbfe38b81cd4ef7acb1578ac1912d9fad 100644 (file)
--- a/src/regexp/ppc/regexp-macro-assembler-ppc.cc
+++ b/src/regexp/ppc/regexp-macro-assembler-ppc.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_PPC
 
 #include "src/regexp/ppc/regexp-macro-assembler-ppc.h"

diff --git a/src/regexp/regexp-macro-assembler-irregexp.cc b/src/regexp/regexp-macro-assembler-irregexp.cc
index 3fbbf650a6ac20ad30ccd40c0982b059bc9a87c7..ca567c9bdab5c4dabe54099495e199db0ce0efb8 100644 (file)
--- a/src/regexp/regexp-macro-assembler-irregexp.cc
+++ b/src/regexp/regexp-macro-assembler-irregexp.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/regexp/regexp-macro-assembler-irregexp.h"
 
 #include "src/ast.h"
 #include "src/regexp/bytecodes-irregexp.h"
 #include "src/regexp/regexp-macro-assembler.h"
-#include "src/regexp/regexp-macro-assembler-irregexp.h"
 #include "src/regexp/regexp-macro-assembler-irregexp-inl.h"
 
 

diff --git a/src/regexp/regexp-macro-assembler-tracer.cc b/src/regexp/regexp-macro-assembler-tracer.cc
index f07741233422f98176c8e14866e138277b0d3f5b..2abe55588e35a1d188acf4a707fc1e0c78ba68b2 100644 (file)
--- a/src/regexp/regexp-macro-assembler-tracer.cc
+++ b/src/regexp/regexp-macro-assembler-tracer.cc
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/regexp/regexp-macro-assembler-tracer.h"
 
 #include "src/ast.h"
-#include "src/regexp/regexp-macro-assembler-tracer.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/regexp/regexp-macro-assembler.cc b/src/regexp/regexp-macro-assembler.cc
index 5bc1d94017c1e5942684684c7349897c4c79bc42..20105c0b30656cc853f5ba4a2261d114a852a988 100644 (file)
--- a/src/regexp/regexp-macro-assembler.cc
+++ b/src/regexp/regexp-macro-assembler.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/regexp/regexp-macro-assembler.h"
 
 #include "src/assembler.h"
 #include "src/ast.h"
-#include "src/regexp/regexp-macro-assembler.h"
 #include "src/regexp/regexp-stack.h"
 #include "src/simulator.h"
 

diff --git a/src/regexp/regexp-stack.cc b/src/regexp/regexp-stack.cc
index 35a58e1e5331d3d02f2f73d957a223b69e7a3223..348e6841515ce054d3359f9f98a8c810847d93bf 100644 (file)
--- a/src/regexp/regexp-stack.cc
+++ b/src/regexp/regexp-stack.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/regexp/regexp-stack.h"
 
+#include "src/isolate.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
+
 namespace v8 {
 namespace internal {
 

diff --git a/src/regexp/regexp-stack.h b/src/regexp/regexp-stack.h
index 210ec0cfe89a0c1f267d47da9cbac53fa8c77cf5..9a6394e198bd0d6382c8a25f8510f9b8c79004d0 100644 (file)
--- a/src/regexp/regexp-stack.h
+++ b/src/regexp/regexp-stack.h
@@ -5,9 +5,9 @@
 #ifndef V8_REGEXP_REGEXP_STACK_H_
 #define V8_REGEXP_REGEXP_STACK_H_
 
-#include "src/allocation.h"
+#include "src/base/logging.h"
+#include "src/base/macros.h"
 #include "src/globals.h"
-#include "src/isolate.h"
 
 namespace v8 {
 namespace internal {

diff --git a/src/regexp/x64/regexp-macro-assembler-x64.cc b/src/regexp/x64/regexp-macro-assembler-x64.cc
index 74b7e87b71fc522ae4c6fb80942c32ff7e30d25f..c0f5f2c3239ccc8cad727afa7dd57c15bd44772a 100644 (file)
--- a/src/regexp/x64/regexp-macro-assembler-x64.cc
+++ b/src/regexp/x64/regexp-macro-assembler-x64.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_X64
 
 #include "src/regexp/x64/regexp-macro-assembler-x64.h"

diff --git a/src/regexp/x87/regexp-macro-assembler-x87.cc b/src/regexp/x87/regexp-macro-assembler-x87.cc
index 9686f646352c71d22b214a991836f67817c422ef..c30994eae0da8bdd73044ae54b15167938e4631e 100644 (file)
--- a/src/regexp/x87/regexp-macro-assembler-x87.cc
+++ b/src/regexp/x87/regexp-macro-assembler-x87.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_X87
 
 #include "src/regexp/x87/regexp-macro-assembler-x87.h"