Add support for extern func in ns in CallFunc

Author: sudo-panda

lib/Interpreter/CppInterOp.cpp

@@ -1273,6 +1273,15 @@ namespace Cpp {
       callbuf << ")";
     }
 
+    const DeclContext* get_non_transparent_decl_context(const FunctionDecl* FD) {
+      auto *DC = FD->getDeclContext();
+      while (DC->isTransparentContext()) {
+        DC = DC->getParent();
+        assert(DC && "All transparent contexts should have a parent!");
+      }
+      return DC;
+    }
+
     void make_narg_call(const FunctionDecl* FD, const std::string& return_type,
                         const unsigned N, std::ostringstream& typedefbuf,
                         std::ostringstream& callbuf,
@@ -1335,8 +1344,8 @@ namespace Cpp {
           callbuf << "((const " << class_name << "*)obj)->";
         else
           callbuf << "((" << class_name << "*)obj)->";
-      } else if (const NamedDecl *ND =
-                     dyn_cast<NamedDecl>(FD->getDeclContext())) {
+      } else if (const NamedDecl* ND =
+                     dyn_cast<NamedDecl>(get_non_transparent_decl_context(FD))) {
         // This is a namespace member.
         (void)ND;
         callbuf << class_name << "::";
@@ -1609,7 +1618,7 @@ namespace Cpp {
       //  Get the class or namespace name.
       //
       std::string class_name;
-      const clang::DeclContext *DC = FD->getDeclContext();
+      const clang::DeclContext* DC = get_non_transparent_decl_context(FD);
       if (const TypeDecl* TD = dyn_cast<TypeDecl>(DC)) {
         // This is a class, struct, or union member.
         QualType QT(TD->getTypeForDecl(), 0);

unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -524,25 +524,46 @@ TEST(FunctionReflectionTest, GetFunctionCallWrapper) {
     void f2(std::string &s) { printf("%s", s.c_str()); };
   )");
 
+  Interp->process(R"(
+    namespace NS {
+      int f3() { return 3; }
+
+      extern "C" int f4() { return 4; }
+    }
+  )");
+
   Sema *S = &Interp->getCI()->getSema();
 
-  Cpp::CallFuncWrapper_t wrapper0 =
+  Cpp::CallFuncWrapper_t wrapper1 =
       Cpp::GetFunctionCallWrapper((Cpp::TInterp_t)Interp.get(), Decls[0]);
-  Cpp::CallFuncWrapper_t wrapper1 = Cpp::GetFunctionCallWrapper(
+  Cpp::CallFuncWrapper_t wrapper2 = Cpp::GetFunctionCallWrapper(
       (Cpp::TInterp_t)Interp.get(), Cpp::GetNamed(S, "f2"));
-  int i = 9, ret;
+  Cpp::CallFuncWrapper_t wrapper3 = Cpp::GetFunctionCallWrapper(
+      (Cpp::TInterp_t)Interp.get(),
+      Cpp::GetNamed(S, "f3", Cpp::GetNamed(S, "NS")));
+  Cpp::CallFuncWrapper_t wrapper4 = Cpp::GetFunctionCallWrapper(
+      (Cpp::TInterp_t)Interp.get(),
+      Cpp::GetNamed(S, "f4", Cpp::GetNamed(S, "NS")));
+
+  int i = 9, ret1, ret3, ret4;
   std::string s("Hello World!\n");
   void *args0[1] = { (void *) &i };
   void *args1[1] = { (void *) &s };
 
-  wrapper0(0, 1, args0, &ret);
+  wrapper1(0, 1, args0, &ret1);
 
   testing::internal::CaptureStdout();
-  wrapper1(0, 1, args1, 0);
+  wrapper2(0, 1, args1, 0);
   std::string output = testing::internal::GetCapturedStdout();
 
-  EXPECT_EQ(ret, i * i);
+  wrapper3(0, 0, 0, &ret3);
+
+  wrapper4(0, 0, 0, &ret4);
+
+  EXPECT_EQ(ret1, i * i);
   EXPECT_EQ(output, s);
+  EXPECT_EQ(ret3, 3);
+  EXPECT_EQ(ret4, 4);
 }
 
 TEST(FunctionReflectionTest, IsConstMethod) {