- The extract tool now is sure to extract the function implementation for

    the specified name instead of extracting the prototype if both exist.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4045 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 14 insertions, 2 deletions

diff --git a/tools/extract/extract.cpp b/tools/extract/extract.cpp
index e904bea..b16b4f6 100644
--- a/tools/extract/extract.cpp
+++ b/tools/extract/extract.cpp
@@ -38,7 +38,13 @@ struct FunctionExtractorPass : public Pass {
     // functions that are not the named function.
     for (Module::iterator I = M.begin(), E = M.end(); I != E;)
       // Check to see if this is the named function!
-      if (!Named && I->getName() == ExtractFunc) {
+      if (I->getName() == ExtractFunc && !I->isExternal()) {
+        if (Named) {                            // Two functions, same name?
+          std::cerr << "extract ERROR: Two functions named: '" << ExtractFunc
+                    << "' found!\n";
+          exit(1);
+        }
+
         // Yes, it is.  Keep track of it...
         Named = I;
 
diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index e904bea..b16b4f6 100644
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -38,7 +38,13 @@ struct FunctionExtractorPass : public Pass {
     // functions that are not the named function.
     for (Module::iterator I = M.begin(), E = M.end(); I != E;)
       // Check to see if this is the named function!
-      if (!Named && I->getName() == ExtractFunc) {
+      if (I->getName() == ExtractFunc && !I->isExternal()) {
+        if (Named) {                            // Two functions, same name?
+          std::cerr << "extract ERROR: Two functions named: '" << ExtractFunc
+                    << "' found!\n";
+          exit(1);
+        }
+
         // Yes, it is.  Keep track of it...
         Named = I;