| Index: BUILD.gn | 
| diff --git a/BUILD.gn b/BUILD.gn | 
| index 9fb1fdcc378856f0f9e569e59f9fa061109a6a66..0e692c65cfcd93e29876595c8808310ff345aa9c 100644 | 
| --- a/BUILD.gn | 
| +++ b/BUILD.gn | 
| @@ -266,40 +266,6 @@ action("js2c") { | 
| } | 
| } | 
|  | 
| -action("js2c_code_stubs") { | 
| -  visibility = [ ":*" ]  # Only targets in this file can depend on this. | 
| - | 
| -  script = "tools/js2c.py" | 
| - | 
| -  # The script depends on this other script, this rule causes a rebuild if it | 
| -  # changes. | 
| -  inputs = [ "tools/jsmin.py" ] | 
| - | 
| -  sources = [ | 
| -    "src/js/macros.py", | 
| -    "src/messages.h", | 
| -    "src/js/code-stubs.js" | 
| -  ] | 
| - | 
| -  outputs = [ | 
| -    "$target_gen_dir/code-stub-libraries.cc", | 
| -  ] | 
| - | 
| -  args = [ | 
| -           rebase_path("$target_gen_dir/code-stub-libraries.cc", | 
| -                       root_build_dir), | 
| -           "CODE_STUB", | 
| -         ] + rebase_path(sources, root_build_dir) | 
| - | 
| -  if (v8_use_external_startup_data) { | 
| -    outputs += [ "$target_gen_dir/libraries_code_stub.bin" ] | 
| -    args += [ | 
| -      "--startup_blob", | 
| -      rebase_path("$target_gen_dir/libraries_code_stub.bin", root_build_dir), | 
| -    ] | 
| -  } | 
| -} | 
| - | 
| action("js2c_experimental") { | 
| visibility = [ ":*" ]  # Only targets in this file can depend on this. | 
|  | 
| @@ -440,7 +406,6 @@ if (v8_use_external_startup_data) { | 
|  | 
| deps = [ | 
| ":js2c", | 
| -      ":js2c_code_stubs", | 
| ":js2c_experimental", | 
| ":js2c_extras", | 
| ":js2c_experimental_extras", | 
| @@ -448,7 +413,6 @@ if (v8_use_external_startup_data) { | 
|  | 
| sources = [ | 
| "$target_gen_dir/libraries.bin", | 
| -      "$target_gen_dir/libraries_code_stub.bin", | 
| "$target_gen_dir/libraries_experimental.bin", | 
| "$target_gen_dir/libraries_extras.bin", | 
| "$target_gen_dir/libraries_experimental_extras.bin", | 
| @@ -536,7 +500,6 @@ source_set("v8_nosnapshot") { | 
|  | 
| deps = [ | 
| ":js2c", | 
| -    ":js2c_code_stubs", | 
| ":js2c_experimental", | 
| ":js2c_extras", | 
| ":js2c_experimental_extras", | 
| @@ -545,7 +508,6 @@ source_set("v8_nosnapshot") { | 
|  | 
| sources = [ | 
| "$target_gen_dir/libraries.cc", | 
| -    "$target_gen_dir/code-stub-libraries.cc", | 
| "$target_gen_dir/experimental-libraries.cc", | 
| "$target_gen_dir/extras-libraries.cc", | 
| "$target_gen_dir/experimental-extras-libraries.cc", | 
| @@ -571,7 +533,6 @@ source_set("v8_snapshot") { | 
|  | 
| deps = [ | 
| ":js2c", | 
| -    ":js2c_code_stubs", | 
| ":js2c_experimental", | 
| ":js2c_extras", | 
| ":js2c_experimental_extras", | 
| @@ -585,7 +546,6 @@ source_set("v8_snapshot") { | 
|  | 
| sources = [ | 
| "$target_gen_dir/libraries.cc", | 
| -    "$target_gen_dir/code-stub-libraries.cc", | 
| "$target_gen_dir/experimental-libraries.cc", | 
| "$target_gen_dir/extras-libraries.cc", | 
| "$target_gen_dir/experimental-extras-libraries.cc", | 
| @@ -607,7 +567,6 @@ if (v8_use_external_startup_data) { | 
|  | 
| deps = [ | 
| ":js2c", | 
| -      ":js2c_code_stubs", | 
| ":js2c_experimental", | 
| ":js2c_extras", | 
| ":js2c_experimental_extras", | 
| @@ -745,6 +704,8 @@ source_set("v8_base") { | 
| "src/compiler/code-generator-impl.h", | 
| "src/compiler/code-generator.cc", | 
| "src/compiler/code-generator.h", | 
| +    "src/compiler/code-stub-assembler.cc", | 
| +    "src/compiler/code-stub-assembler.h", | 
| "src/compiler/common-node-cache.cc", | 
| "src/compiler/common-node-cache.h", | 
| "src/compiler/common-operator-reducer.cc", | 
|  |