From 35984a884977a26e6aa8a2949769f313de64506e Mon Sep 17 00:00:00 2001
From: Dan Gohman <gohman@apple.com>
Date: Tue, 8 Sep 2009 22:20:35 +0000
Subject: [PATCH] Use MemoryBuffer::getBufferIdentifier() in the AsmPrinter
 instead of requiring a name be passed in. This makes it use "<stdin>" instead
 of "-" and makes it more consistent with the Bitcode reader.

llvm-svn: 81256
---
 include/llvm/Assembly/Parser.h  |  1 -
 include/llvm/Support/IRReader.h | 14 ++++++--------
 lib/AsmParser/Parser.cpp        |  7 +++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/include/llvm/Assembly/Parser.h b/include/llvm/Assembly/Parser.h
index a508d5ce107..82ec6d81367 100644
--- a/include/llvm/Assembly/Parser.h
+++ b/include/llvm/Assembly/Parser.h
@@ -55,7 +55,6 @@ Module *ParseAssemblyString(
 /// takes ownership of the MemoryBuffer.
 Module *ParseAssembly(
     MemoryBuffer *F,     ///< The MemoryBuffer containing assembly
-    const std::string &Name, ///< The name of the original source file
     Module *M,           ///< A module to add the assembly too.
     SMDiagnostic &Err,   ///< Error result info.
     LLVMContext &Context
diff --git a/include/llvm/Support/IRReader.h b/include/llvm/Support/IRReader.h
index 56700117d22..e7780b05d53 100644
--- a/include/llvm/Support/IRReader.h
+++ b/include/llvm/Support/IRReader.h
@@ -33,7 +33,6 @@ namespace llvm {
   /// ModuleProvider. This function *always* takes ownership of the given
   /// MemoryBuffer.
   inline ModuleProvider *getIRModuleProvider(MemoryBuffer *Buffer,
-                                             const std::string &Filename,
                                              SMDiagnostic &Err,
                                              LLVMContext &Context) {
     if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
@@ -41,7 +40,7 @@ namespace llvm {
       std::string ErrMsg;
       ModuleProvider *MP = getBitcodeModuleProvider(Buffer, Context, &ErrMsg);
       if (MP == 0) {
-        Err = SMDiagnostic(Filename, -1, -1, ErrMsg, "");
+        Err = SMDiagnostic(Buffer->getBufferIdentifier(), -1, -1, ErrMsg, "");
         // ParseBitcodeFile does not take ownership of the Buffer in the
         // case of an error.
         delete Buffer;
@@ -49,7 +48,7 @@ namespace llvm {
       return MP;
     }
 
-    Module *M = ParseAssembly(Buffer, Filename, 0, Err, Context);
+    Module *M = ParseAssembly(Buffer, 0, Err, Context);
     if (M == 0)
       return 0;
     return new ExistingModuleProvider(M);
@@ -70,7 +69,7 @@ namespace llvm {
       return 0;
     }
 
-    return getIRModuleProvider(F, Filename, Err, Context);
+    return getIRModuleProvider(F, Err, Context);
   }
 
   /// If the given MemoryBuffer holds a bitcode image, return a Module
@@ -78,7 +77,6 @@ namespace llvm {
   /// a Module for it. This function *always* takes ownership of the given
   /// MemoryBuffer.
   inline Module *ParseIR(MemoryBuffer *Buffer,
-                         const std::string &Filename,
                          SMDiagnostic &Err,
                          LLVMContext &Context) {
     if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
@@ -88,11 +86,11 @@ namespace llvm {
       // ParseBitcodeFile does not take ownership of the Buffer.
       delete Buffer;
       if (M == 0)
-        Err = SMDiagnostic(Filename, -1, -1, ErrMsg, "");
+        Err = SMDiagnostic(Buffer->getBufferIdentifier(), -1, -1, ErrMsg, "");
       return M;
     }
 
-    return ParseAssembly(Buffer, Filename, 0, Err, Context);
+    return ParseAssembly(Buffer, 0, Err, Context);
   }
 
   /// If the given file holds a bitcode image, return a Module for it.
@@ -109,7 +107,7 @@ namespace llvm {
       return 0;
     }
 
-    return ParseIR(F, Filename, Err, Context);
+    return ParseIR(F, Err, Context);
   }
 
 }
diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index 3fc913bf3f1..331a23323b5 100644
--- a/lib/AsmParser/Parser.cpp
+++ b/lib/AsmParser/Parser.cpp
@@ -22,7 +22,6 @@
 using namespace llvm;
 
 Module *llvm::ParseAssembly(MemoryBuffer *F,
-                            const std::string &Name,
                             Module *M,
                             SMDiagnostic &Err,
                             LLVMContext &Context) {
@@ -34,7 +33,7 @@ Module *llvm::ParseAssembly(MemoryBuffer *F,
     return LLParser(F, SM, Err, M).Run() ? 0 : M;
 
   // Otherwise create a new module.
-  OwningPtr<Module> M2(new Module(Name, Context));
+  OwningPtr<Module> M2(new Module(F->getBufferIdentifier(), Context));
   if (LLParser(F, SM, Err, M2.get()).Run())
     return 0;
   return M2.take();
@@ -50,7 +49,7 @@ Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err,
     return 0;
   }
 
-  return ParseAssembly(F, Filename, 0, Err, Context);
+  return ParseAssembly(F, 0, Err, Context);
 }
 
 Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
@@ -59,5 +58,5 @@ Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
     MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
                                "<string>");
 
-  return ParseAssembly(F, "<string>", M, Err, Context);
+  return ParseAssembly(F, M, Err, Context);
 }