From e1eb43b8cf85ae29091865c128d8c6019375fc72 Mon Sep 17 00:00:00 2001
From: Teresa Johnson <tejohnson@google.com>
Date: Wed, 30 Mar 2016 15:16:04 +0000
Subject: [PATCH] Revert "[ThinLTO] Serialize the Module SourceFileName to/from
 LLVM assembly"

This reverts commit r264869. I am seeing Windows bot failures due to the
"\" in the path being mishandled at some point (seems to be interpreted
wrongly at some point and llvm-as | llvm-dis is yielding some junk
characters). Need to investigate.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@264871 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/AsmParser/LLLexer.cpp         |  1 -
 lib/AsmParser/LLParser.cpp        | 17 -----------------
 lib/AsmParser/LLParser.h          |  1 -
 lib/AsmParser/LLToken.h           |  1 -
 lib/IR/AsmWriter.cpp              |  3 ---
 test/Assembler/source-filename.ll |  8 --------
 6 files changed, 31 deletions(-)
 delete mode 100644 test/Assembler/source-filename.ll

diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp
index 46ffc642ec6..d2385130912 100644
--- a/lib/AsmParser/LLLexer.cpp
+++ b/lib/AsmParser/LLLexer.cpp
@@ -533,7 +533,6 @@ lltok::Kind LLLexer::LexIdentifier() {
   KEYWORD(notail);
   KEYWORD(target);
   KEYWORD(triple);
-  KEYWORD(source_filename);
   KEYWORD(unwind);
   KEYWORD(deplibs);             // FIXME: Remove in 4.0.
   KEYWORD(datalayout);
diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index 39c613599e6..76bd99e9b66 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -239,10 +239,6 @@ bool LLParser::ParseTopLevelEntities() {
     case lltok::kw_define:  if (ParseDefine()) return true; break;
     case lltok::kw_module:  if (ParseModuleAsm()) return true; break;
     case lltok::kw_target:  if (ParseTargetDefinition()) return true; break;
-    case lltok::kw_source_filename:
-      if (ParseSourceFileName())
-        return true;
-      break;
     case lltok::kw_deplibs: if (ParseDepLibs()) return true; break;
     case lltok::LocalVarID: if (ParseUnnamedType()) return true; break;
     case lltok::LocalVar:   if (ParseNamedType()) return true; break;
@@ -339,19 +335,6 @@ bool LLParser::ParseTargetDefinition() {
   }
 }
 
-/// toplevelentity
-///   ::= 'source_filename' '=' STRINGCONSTANT
-bool LLParser::ParseSourceFileName() {
-  assert(Lex.getKind() == lltok::kw_source_filename);
-  std::string Str;
-  Lex.Lex();
-  if (ParseToken(lltok::equal, "expected '=' after source_filename") ||
-      ParseStringConstant(Str))
-    return true;
-  M->setSourceFileName(Str);
-  return false;
-}
-
 /// toplevelentity
 ///   ::= 'deplibs' '=' '[' ']'
 ///   ::= 'deplibs' '=' '[' STRINGCONSTANT (',' STRINGCONSTANT)* ']'
diff --git a/lib/AsmParser/LLParser.h b/lib/AsmParser/LLParser.h
index fcece62c6b8..96f864a7f1a 100644
--- a/lib/AsmParser/LLParser.h
+++ b/lib/AsmParser/LLParser.h
@@ -261,7 +261,6 @@ namespace llvm {
     bool ValidateEndOfModule();
     bool ParseTargetDefinition();
     bool ParseModuleAsm();
-    bool ParseSourceFileName();
     bool ParseDepLibs();        // FIXME: Remove in 4.0.
     bool ParseUnnamedType();
     bool ParseNamedType();
diff --git a/lib/AsmParser/LLToken.h b/lib/AsmParser/LLToken.h
index c5a74901985..f06b5b81a13 100644
--- a/lib/AsmParser/LLToken.h
+++ b/lib/AsmParser/LLToken.h
@@ -59,7 +59,6 @@ namespace lltok {
     kw_notail,
     kw_target,
     kw_triple,
-    kw_source_filename,
     kw_unwind,
     kw_deplibs,                 // FIXME: Remove in 4.0
     kw_datalayout,
diff --git a/lib/IR/AsmWriter.cpp b/lib/IR/AsmWriter.cpp
index 3051193f890..ab56f08014e 100644
--- a/lib/IR/AsmWriter.cpp
+++ b/lib/IR/AsmWriter.cpp
@@ -2215,9 +2215,6 @@ void AssemblyWriter::printModule(const Module *M) {
       M->getModuleIdentifier().find('\n') == std::string::npos)
     Out << "; ModuleID = '" << M->getModuleIdentifier() << "'\n";
 
-  if (!M->getSourceFileName().empty())
-    Out << "source_filename = \"" << M->getSourceFileName() << "\"\n";
-
   const std::string &DL = M->getDataLayoutStr();
   if (!DL.empty())
     Out << "target datalayout = \"" << DL << "\"\n";
diff --git a/test/Assembler/source-filename.ll b/test/Assembler/source-filename.ll
deleted file mode 100644
index 11284fad1ea..00000000000
--- a/test/Assembler/source-filename.ll
+++ /dev/null
@@ -1,8 +0,0 @@
-
-; Make sure that llvm-as/llvm-dis properly assemble/disassemble the
-; source_filename.
-
-; RUN: llvm-as < %s | llvm-dis | FileCheck %s
-
-; CHECK: source_filename = "test.cc"
-source_filename = "test.cc"