X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FLinker%2FLinkArchives.cpp;h=6cab77c60106b68f27807c012068e05b6e932a9b;hb=73b43b9b549a75fb0015c825df68abd95705a67c;hp=e6a3b8a52309673fe3b0821f38e20bd9d9630f9b;hpb=1a019e5ffd0d8643ddffc7ed5736eb78065c5f88;p=oota-llvm.git

diff --git a/lib/Linker/LinkArchives.cpp b/lib/Linker/LinkArchives.cpp
index e6a3b8a5230..6cab77c6010 100644
--- a/lib/Linker/LinkArchives.cpp
+++ b/lib/Linker/LinkArchives.cpp
@@ -2,12 +2,12 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group 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.
 //
 //===----------------------------------------------------------------------===//
 //
-// This file contains routines to handle linking together LLVM bytecode files,
+// This file contains routines to handle linking together LLVM bitcode files,
 // and to handle annoying things like static libraries.
 //
 //===----------------------------------------------------------------------===//
@@ -16,7 +16,7 @@
 #include "llvm/Module.h"
 #include "llvm/ModuleProvider.h"
 #include "llvm/ADT/SetOperations.h"
-#include "llvm/Bytecode/Archive.h"
+#include "llvm/Bitcode/Archive.h"
 #include "llvm/Config/config.h"
 #include <memory>
 #include <set>
@@ -56,6 +56,7 @@ GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols) {
         DefinedSymbols.insert(I->getName());
       }      
     }
+
   for (Module::global_iterator I = M->global_begin(), E = M->global_end();
        I != E; ++I)
     if (I->hasName()) {
@@ -68,6 +69,11 @@ GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols) {
       }      
     }
 
+  for (Module::alias_iterator I = M->alias_begin(), E = M->alias_end();
+       I != E; ++I)
+    if (I->hasName())
+      DefinedSymbols.insert(I->getName());
+
   // Prune out any defined symbols from the undefined symbols set...
   for (std::set<std::string>::iterator I = UndefinedSymbols.begin();
        I != UndefinedSymbols.end(); )
@@ -88,7 +94,6 @@ GetAllUndefinedSymbols(Module *M, std::set<std::string> &UndefinedSymbols) {
 ///  FALSE - No errors.
 bool
 Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
-
   // Make sure this is an archive file we're dealing with
   if (!Filename.isArchive())
     return error("File '" + Filename.toString() + "' is not an archive.");
@@ -96,7 +101,7 @@ Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
   // Open the archive file
   verbose("Linking archive file '" + Filename.toString() + "'");
 
-  // Find all of the symbols currently undefined in the bytecode program.
+  // Find all of the symbols currently undefined in the bitcode program.
   // If all the symbols are defined, the program is complete, and there is
   // no reason to link in any archive files.
   std::set<std::string> UndefinedSymbols;
@@ -117,7 +122,7 @@ Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
   if (!arch)
     return error("Cannot read archive '" + Filename.toString() +
                  "': " + ErrMsg);
-  if (!arch->isBytecodeArchive()) {
+  if (!arch->isBitcodeArchive()) {
     is_native = true;
     return false;
   }
@@ -159,6 +164,9 @@ Linker::LinkInArchive(const sys::Path &Filename, bool &is_native) {
       // Get the module we must link in.
       std::string moduleErrorMsg;
       std::auto_ptr<Module> AutoModule((*I)->releaseModule( &moduleErrorMsg ));
+      if (!moduleErrorMsg.empty())
+        return error("Could not load a module: " + moduleErrorMsg);
+
       Module* aModule = AutoModule.get();
 
       if (aModule != NULL) {