Simplify some getNode calls.

[oota-llvm.git] / lib / Linker / Linker.cpp

diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp
index 4604305b6d5a0abd13cb1452704c0fb9f58a05a4..ef242e5c798d585f47188297db3ff8d7737c6ff9 100644 (file)
--- a/lib/Linker/Linker.cpp
+++ b/lib/Linker/Linker.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -19,7 +19,8 @@
 #include "llvm/Support/Streams.h"
 using namespace llvm;
 
-Linker::Linker(const std::string& progname, const std::string& modname, unsigned flags)
+Linker::Linker(const std::string& progname, const std::string& modname,
+               unsigned flags)
   : Composite(0)
   , LibPaths()
   , Flags(flags)
@@ -103,8 +104,7 @@ Linker::LoadObject(const sys::Path &FN) {
   Module *Result = 0;
   
   const std::string &FNS = FN.toString();
-  std::auto_ptr<MemoryBuffer> Buffer(
-                          MemoryBuffer::getFileOrSTDIN(&FNS[0], FNS.size()));
+  std::auto_ptr<MemoryBuffer> Buffer(MemoryBuffer::getFileOrSTDIN(FNS.c_str()));
   if (Buffer.get())
     Result = ParseBitcodeFile(Buffer.get(), &ParseErrorMessage);
   else
@@ -142,8 +142,6 @@ static inline sys::Path IsLibrary(const std::string& Name,
   FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1]));
   if (FullPath.isDynamicLibrary())  // Native shared library?
     return FullPath;
-  if (FullPath.isBytecodeFile())    // .so file containing bytecode?
-    return FullPath;
   if (FullPath.isBitcodeFile())    // .so file containing bitcode?
     return FullPath;