Make sure functions are generated even there is no global in the C API echo test

llvm-svn: 261169

1 files changed, 10 insertions, 6 deletions

diff --git a/llvm/tools/llvm-c-test/echo.cpp b/llvm/tools/llvm-c-test/echo.cpp
index b926c8124f0..1aa6a762dc4 100644
--- a/llvm/tools/llvm-c-test/echo.cpp
+++ b/llvm/tools/llvm-c-test/echo.cpp
@@ -625,14 +625,15 @@ struct FunCloner {
 static void declare_symbols(LLVMModuleRef Src, LLVMModuleRef M) {
   LLVMValueRef Begin = LLVMGetFirstGlobal(Src);
   LLVMValueRef End = LLVMGetLastGlobal(Src);
+
+  LLVMValueRef Cur = Begin;
+  LLVMValueRef Next = nullptr;
   if (!Begin) {
     if (End != nullptr)
       report_fatal_error("Range has an end but no begining");
-    return;
+    goto FunDecl;
   }
 
-  LLVMValueRef Cur = Begin;
-  LLVMValueRef Next = nullptr;
   while (true) {
     const char *Name = LLVMGetValueName(Cur);
     if (LLVMGetNamedGlobal(M, Name))
@@ -653,6 +654,7 @@ static void declare_symbols(LLVMModuleRef Src, LLVMModuleRef M) {
     Cur = Next;
   }
 
+FunDecl:
   Begin = LLVMGetFirstFunction(Src);
   End = LLVMGetLastFunction(Src);
   if (!Begin) {
@@ -687,14 +689,15 @@ static void declare_symbols(LLVMModuleRef Src, LLVMModuleRef M) {
 static void clone_symbols(LLVMModuleRef Src, LLVMModuleRef M) {
   LLVMValueRef Begin = LLVMGetFirstGlobal(Src);
   LLVMValueRef End = LLVMGetLastGlobal(Src);
+
+  LLVMValueRef Cur = Begin;
+  LLVMValueRef Next = nullptr;
   if (!Begin) {
     if (End != nullptr)
       report_fatal_error("Range has an end but no begining");
-    return;
+    goto FunClone;
   }
 
-  LLVMValueRef Cur = Begin;
-  LLVMValueRef Next = nullptr;
   while (true) {
     const char *Name = LLVMGetValueName(Cur);
     LLVMValueRef G = LLVMGetNamedGlobal(M, Name);
@@ -727,6 +730,7 @@ static void clone_symbols(LLVMModuleRef Src, LLVMModuleRef M) {
     Cur = Next;
   }
 
+FunClone:
   Begin = LLVMGetFirstFunction(Src);
   End = LLVMGetLastFunction(Src);
   if (!Begin) {