From c263d87ffb73c7f474f3e6e170f1451abbf4098c Mon Sep 17 00:00:00 2001
From: Yang Guo <yangguo@chromium.org>
Date: Mon, 4 Jun 2018 09:01:45 +0200
Subject: [PATCH] Fix rebase artifacts.

---
 deps/v8/src/api.cc                      | 2 --
 deps/v8/src/snapshot/code-serializer.cc | 1 -
 deps/v8/src/snapshot/code-serializer.h  | 4 ++--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc
index d78899347b7dd8..e9a5ec69ec4a71 100644
--- a/deps/v8/src/api.cc
+++ b/deps/v8/src/api.cc
@@ -2634,7 +2634,6 @@ ScriptCompiler::CachedData* ScriptCompiler::CreateCodeCache(
   i::Handle<i::SharedFunctionInfo> shared =
       i::Handle<i::SharedFunctionInfo>::cast(
           Utils::OpenHandle(*unbound_script));
-  i::Handle<i::String> source_str = Utils::OpenHandle(*source);
   DCHECK(shared->is_toplevel());
   return i::CodeSerializer::Serialize(shared);
 }
@@ -2648,7 +2647,6 @@ ScriptCompiler::CachedData* ScriptCompiler::CreateCodeCacheForFunction(
     Local<Function> function) {
   i::Handle<i::SharedFunctionInfo> shared(
       i::Handle<i::JSFunction>::cast(Utils::OpenHandle(*function))->shared());
-  i::Handle<i::String> source_str = Utils::OpenHandle(*source);
   CHECK(shared->is_wrapped());
   return i::CodeSerializer::Serialize(shared);
 }
diff --git a/deps/v8/src/snapshot/code-serializer.cc b/deps/v8/src/snapshot/code-serializer.cc
index 7bc6c9a779643a..823d8dc9af8b87 100644
--- a/deps/v8/src/snapshot/code-serializer.cc
+++ b/deps/v8/src/snapshot/code-serializer.cc
@@ -30,7 +30,6 @@ ScriptData::ScriptData(const byte* data, int length)
   }
 }
 
-<<<<<<< HEAD
 // static
 ScriptCompiler::CachedData* CodeSerializer::Serialize(
     Handle<SharedFunctionInfo> info) {
diff --git a/deps/v8/src/snapshot/code-serializer.h b/deps/v8/src/snapshot/code-serializer.h
index 1c58b45f7193fd..f6b51bf9b1a0bc 100644
--- a/deps/v8/src/snapshot/code-serializer.h
+++ b/deps/v8/src/snapshot/code-serializer.h
@@ -46,8 +46,8 @@ class ScriptData {
 class CodeSerializer : public Serializer<> {
  public:
   static ScriptCompiler::CachedData* Serialize(Handle<SharedFunctionInfo> info);
-  static ScriptData* SerializeSharedFunctionInfo(Handle<SharedFunctionInfo> info);
-  ScriptData* Serialize(Handle<HeapObject> obj);
+
+  ScriptData* SerializeSharedFunctionInfo(Handle<SharedFunctionInfo> info);
 
   V8_WARN_UNUSED_RESULT static MaybeHandle<SharedFunctionInfo> Deserialize(
       Isolate* isolate, ScriptData* cached_data, Handle<String> source);