Check TRI->getReservedRegs because other allocators do it. Even though

[oota-llvm.git] / lib / AsmParser / Parser.cpp

diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp
index 3fc913bf3f138c584af90897a3d4cc81cd3c705d..e7cef9b5c3c587af068dffdeb8af089c7e9f7f36 100644 (file)
--- 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();
@@ -45,19 +44,19 @@ Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err,
   std::string ErrorStr;
   MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr);
   if (F == 0) {
-    Err = SMDiagnostic("", -1, -1,
-                       "Could not open input file '" + Filename + "'", "");
+    Err = SMDiagnostic(Filename,
+                       "Could not open input file: " + ErrorStr);
     return 0;
   }
 
-  return ParseAssembly(F, Filename, 0, Err, Context);
+  return ParseAssembly(F, 0, Err, Context);
 }
 
 Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
                                   SMDiagnostic &Err, LLVMContext &Context) {
   MemoryBuffer *F =
-    MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
+    MemoryBuffer::getMemBuffer(StringRef(AsmString, strlen(AsmString)),
                                "<string>");
 
-  return ParseAssembly(F, "<string>", M, Err, Context);
+  return ParseAssembly(F, M, Err, Context);
 }