Commit cf63b845 authored by Richard Smith's avatar Richard Smith
Browse files

MSVC seems to use (void) in __FUNCSIG__ for a zero-parameter function even in C++. Follow suit. 

llvm-svn: 291489
parent fa328947

clang/lib/AST/Expr.cpp

+3 −2
Original line number Diff line number Diff line
@@ -582,12 +582,13 @@ std::string PredefinedExpr::ComputeName(IdentType IT, const Decl *CurrentDecl) { 
        if (i) POut << ", ";

        POut << Decl->getParamDecl(i)->getType().stream(Policy);

      }

      if (!Context.getLangOpts().CPlusPlus && !Decl->getNumParams())

        POut << "void";



      if (FT->isVariadic()) {

        if (FD->getNumParams()) POut << ", ";

        POut << "...";

      } else if ((IT == FuncSig || !Context.getLangOpts().CPlusPlus) &&

                 !Decl->getNumParams()) {

        POut << "void";

      }

    }

    POut << ")";

clang/test/CodeGenCXX/funcsig.cpp

+7 −3
Original line number Diff line number Diff line
@@ -13,13 +13,12 @@ void funcNoProto() { 
  printf("__FUNCSIG__ %s\n\n", __FUNCSIG__);

}

// CHECK-C:   @"\01??_C@_0BL@IHLLLCAO@void?5__cdecl?5funcNoProto?$CI?$CJ?$AA@" = linkonce_odr unnamed_addr constant [27 x i8] c"void __cdecl funcNoProto()\00"

// CHECK-CXX: @"\01??_C@_0BL@IHLLLCAO@void?5__cdecl?5funcNoProto?$CI?$CJ?$AA@" = linkonce_odr unnamed_addr constant [27 x i8] c"void __cdecl funcNoProto()\00"

// CHECK-CXX: @"\01??_C@_0BP@PJOECCJN@void?5__cdecl?5funcNoProto?$CIvoid?$CJ?$AA@" = linkonce_odr unnamed_addr constant [31 x i8] c"void __cdecl funcNoProto(void)\00"



void funcNoParams(void) {

  printf("__FUNCSIG__ %s\n\n", __FUNCSIG__);

}

// CHECK-C:   @"\01??_C@_0CA@GBIDFNBN@void?5__cdecl?5funcNoParams?$CIvoid?$CJ?$AA@" = linkonce_odr unnamed_addr constant [32 x i8] c"void __cdecl funcNoParams(void)\00"

// CHECK-CXX: @"\01??_C@_0BM@GDFBOAEE@void?5__cdecl?5funcNoParams?$CI?$CJ?$AA@" = linkonce_odr unnamed_addr constant [28 x i8] c"void __cdecl funcNoParams()\00"

// CHECK: @"\01??_C@_0CA@GBIDFNBN@void?5__cdecl?5funcNoParams?$CIvoid?$CJ?$AA@" = linkonce_odr unnamed_addr constant [32 x i8] c"void __cdecl funcNoParams(void)\00"



void freeFunc(int *p, char c) {

  printf("__FUNCSIG__ %s\n\n", __FUNCSIG__);
@@ -27,6 +26,11 @@ void freeFunc(int *p, char c) { 
// CHECK: @"\01??_C@_0CD@KLGMNNL@void?5__cdecl?5freeFunc?$CIint?5?$CK?0?5cha@" = linkonce_odr unnamed_addr constant [{{.*}} x i8] c"void __cdecl freeFunc(int *, char)\00"



#ifdef __cplusplus

void funcVarargs(...) {

  printf("__FUNCSIG__ %s\n\n", __FUNCSIG__);

}

// CHECK-CXX: @"\01??_C@_0BO@BOBPLEKP@void?5__cdecl?5funcVarargs?$CI?4?4?4?$CJ?$AA@" = linkonce_odr unnamed_addr constant [30 x i8] c"void __cdecl funcVarargs(...)\00"



struct TopLevelClass {

  void topLevelMethod(int *, char);

};