From ad6f3355a7463c25aead44b71c48b85409a53402 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Sun, 4 Jan 2009 20:44:11 +0000
Subject: Refactor some parser interfaces to fix PR3278 and a FIXME:
 ParseAssemblyString with a specified module would not parse into the module,
 it would create and return a new one.

llvm-svn: 61635
---
 llvm/lib/AsmParser/Parser.cpp | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'llvm/lib/AsmParser/Parser.cpp')

diff --git a/llvm/lib/AsmParser/Parser.cpp b/llvm/lib/AsmParser/Parser.cpp
index ce0d268a16e..08c239135b6 100644
--- a/llvm/lib/AsmParser/Parser.cpp
+++ b/llvm/lib/AsmParser/Parser.cpp
@@ -14,6 +14,7 @@
 #include "llvm/Assembly/Parser.h"
 #include "LLParser.h"
 #include "llvm/Module.h"
+#include "llvm/ADT/OwningPtr.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cstring>
@@ -23,28 +24,36 @@ Module *llvm::ParseAssemblyFile(const std::string &Filename, ParseError &Err) {
   Err.setFilename(Filename);
 
   std::string ErrorStr;
-  MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr);
+  OwningPtr<MemoryBuffer>
+    F(MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr));
   if (F == 0) {
     Err.setError("Could not open input file '" + Filename + "'");
     return 0;
   }
 
-  Module *Result = LLParser(F, Err).Run();
-  delete F;
-  return Result;
+  OwningPtr<Module> M(new Module(Filename));
+  if (LLParser(F.get(), Err, M.get()).Run())
+    return 0;
+  return M.take();
 }
 
-// FIXME: M is ignored??
 Module *llvm::ParseAssemblyString(const char *AsmString, Module *M,
                                   ParseError &Err) {
   Err.setFilename("<string>");
 
-  MemoryBuffer *F = MemoryBuffer::getMemBuffer(AsmString,
-                                               AsmString+strlen(AsmString),
-                                               "<string>");
-  Module *Result = LLParser(F, Err).Run();
-  delete F;
-  return Result;
+  OwningPtr<MemoryBuffer>
+    F(MemoryBuffer::getMemBuffer(AsmString, AsmString+strlen(AsmString),
+                                 "<string>"));
+  
+  // If we are parsing into an existing module, do it.
+  if (M)
+    return LLParser(F.get(), Err, M).Run() ? 0 : M;
+
+  // Otherwise create a new module.
+  OwningPtr<Module> M2(new Module("<string>"));
+  if (LLParser(F.get(), Err, M2.get()).Run())
+    return 0;
+  return M2.take();
 }
 
 
-- 
cgit v1.2.3