Merged: Squashed multiple commits.

Merged: snapshot: add source line stubs for ARM64 Windows
Revision: 58cefed29c3bd4ab419a8026b96f9fba8b9e86c7

Merged: Move ARM64 Assembler::nop definition from header to source file
Revision: 7803fa68f48b15534b3dccab5f6eefc9e714e62a

BUG=chromium:893460,v8:8870
LOG=N
NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true
R=jgruber@chromium.org

Change-Id: Idc2623b2f12220e42ddb9388a36d4f02ff2a1409
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1506201
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/branch-heads/7.3@{#38}
Cr-Branched-From: 9df9418edf64d6a080ba569ef43cd5ca0171a820-refs/heads/7.3.492@{#2}
Cr-Branched-From: be213cfc485101c67efe00af1fffba84fa9fc8a5-refs/heads/master@{#59024}
diff --git a/src/arm64/assembler-arm64.cc b/src/arm64/assembler-arm64.cc
index 5c55be2..be0a4a9 100644
--- a/src/arm64/assembler-arm64.cc
+++ b/src/arm64/assembler-arm64.cc
@@ -1097,6 +1097,12 @@
 }
 
 
+void Assembler::nop(NopMarkerTypes n) {
+  DCHECK((FIRST_NOP_MARKER <= n) && (n <= LAST_NOP_MARKER));
+  mov(Register::XRegFromCode(n), Register::XRegFromCode(n));
+}
+
+
 void Assembler::add(const Register& rd,
                     const Register& rn,
                     const Operand& operand) {
diff --git a/src/arm64/assembler-arm64.h b/src/arm64/assembler-arm64.h
index 8c86a68..54e46c7 100644
--- a/src/arm64/assembler-arm64.h
+++ b/src/arm64/assembler-arm64.h
@@ -1089,10 +1089,7 @@
     LAST_NOP_MARKER = ADR_FAR_NOP
   };
 
-  void nop(NopMarkerTypes n) {
-    DCHECK((FIRST_NOP_MARKER <= n) && (n <= LAST_NOP_MARKER));
-    mov(Register::XRegFromCode(n), Register::XRegFromCode(n));
-  }
+  void nop(NopMarkerTypes n);
 
   // Add.
   void add(const VRegister& vd, const VRegister& vn, const VRegister& vm);
diff --git a/src/snapshot/embedded-file-writer.cc b/src/snapshot/embedded-file-writer.cc
index 6394287..36a5f0e 100644
--- a/src/snapshot/embedded-file-writer.cc
+++ b/src/snapshot/embedded-file-writer.cc
@@ -367,7 +367,7 @@
 
 void PlatformDependentEmbeddedFileWriter::SourceInfo(int fileid, int line) {
   // TODO(mvstanton): output source information for MSVC.
-  // It's syntax is #line <line> "<filename>"
+  // Its syntax is #line <line> "<filename>"
 }
 
 void PlatformDependentEmbeddedFileWriter::DeclareFunctionBegin(
@@ -471,6 +471,11 @@
   fprintf(fp_, "%s%s\n", SYMBOL_PREFIX, name);
 }
 
+void PlatformDependentEmbeddedFileWriter::SourceInfo(int fileid, int line) {
+  // TODO(mvstanton): output source information for MSVC.
+  // Its syntax is #line <line> "<filename>"
+}
+
 void PlatformDependentEmbeddedFileWriter::DeclareFunctionBegin(
     const char* name) {
   fprintf(fp_, "%s%s FUNCTION\n", SYMBOL_PREFIX, name);
@@ -486,6 +491,9 @@
 
 void PlatformDependentEmbeddedFileWriter::FilePrologue() {}
 
+void PlatformDependentEmbeddedFileWriter::DeclareExternalFilename(
+    int fileid, const char* filename) {}
+
 void PlatformDependentEmbeddedFileWriter::FileEpilogue() {
   fprintf(fp_, "  END\n");
 }