diff --git a/compiler/codegen/cg-expr.cpp b/compiler/codegen/cg-expr.cpp index 8d1338fed84f..ae1598dab964 100644 --- a/compiler/codegen/cg-expr.cpp +++ b/compiler/codegen/cg-expr.cpp @@ -2938,7 +2938,7 @@ static GenRet codegenCallExprInner(GenRet function, for (size_t i = 0; i < args.size(); i++) { const clang::CodeGen::ABIArgInfo* argInfo = NULL; if (CGI) { - argInfo = getCGArgInfo(CGI, i); + argInfo = getCGArgInfo(CGI, i, fn); } else if (args[i].isLVPtr == GEN_VAL && useDarwinArmFix(args[i].chplType)) { argInfo = getSingleCGArgInfo(args[i].chplType); } diff --git a/compiler/codegen/cg-symbol.cpp b/compiler/codegen/cg-symbol.cpp index ae5bd8be57a3..b9490933cafc 100644 --- a/compiler/codegen/cg-symbol.cpp +++ b/compiler/codegen/cg-symbol.cpp @@ -2047,7 +2047,7 @@ codegenFunctionTypeLLVM(FnSymbol* fn, llvm::AttributeList& attrs, for_formals(formal, fn) { const clang::CodeGen::ABIArgInfo* argInfo = NULL; if (CGI) { - argInfo = getCGArgInfo(CGI, clangArgNum); + argInfo = getCGArgInfo(CGI, clangArgNum, fn); } else if (useDarwinArmFix(formal->type)) { argInfo = getSingleCGArgInfo(formal->type); } @@ -2767,7 +2767,7 @@ void FnSymbol::codegenDef() { for_formals(arg, this) { const clang::CodeGen::ABIArgInfo* argInfo = NULL; if (CGI) { - argInfo = getCGArgInfo(CGI, clangArgNum); + argInfo = getCGArgInfo(CGI, clangArgNum, this); } else if (useDarwinArmFix(arg->type)) { argInfo = getSingleCGArgInfo(arg->type); } diff --git a/compiler/include/clangUtil.h b/compiler/include/clangUtil.h index cbc160e303cd..e6edf0a22cc6 100644 --- a/compiler/include/clangUtil.h +++ b/compiler/include/clangUtil.h @@ -97,7 +97,8 @@ const clang::CodeGen::CGFunctionInfo& getClangABIInfoFD(clang::FunctionDecl* FD) const clang::CodeGen::CGFunctionInfo& getClangABIInfo(FnSymbol* fn); const clang::CodeGen::ABIArgInfo* -getCGArgInfo(const clang::CodeGen::CGFunctionInfo* CGI, int curCArg); +getCGArgInfo(const clang::CodeGen::CGFunctionInfo* CGI, int curCArg, + FnSymbol* fn=nullptr); const clang::CodeGen::ABIArgInfo* getSingleCGArgInfo(Type* type); diff --git a/compiler/llvm/clangUtil.cpp b/compiler/llvm/clangUtil.cpp index c11f527ab8e2..3024984911dc 100644 --- a/compiler/llvm/clangUtil.cpp +++ b/compiler/llvm/clangUtil.cpp @@ -4002,17 +4002,25 @@ const clang::CodeGen::CGFunctionInfo& getClangABIInfo(FnSymbol* fn) { } const clang::CodeGen::ABIArgInfo* -getCGArgInfo(const clang::CodeGen::CGFunctionInfo* CGI, int curCArg) +getCGArgInfo(const clang::CodeGen::CGFunctionInfo* CGI, int curCArg, + FnSymbol* fn) { // Don't try to use the calling convention code for variadic args. - if ((unsigned) curCArg >= CGI->arg_size() && CGI->isVariadic()) - return NULL; + if ((unsigned) curCArg >= CGI->arg_size()) { + if (CGI->isVariadic()) { + return NULL; + } + else { + USR_FATAL(fn, "Argument number mismatch in export proc"); + } + } const clang::CodeGen::ABIArgInfo* argInfo = NULL; #if HAVE_LLVM_VER >= 100 llvm::ArrayRef a=CGI->arguments(); argInfo = &a[curCArg].info; + #else int i = 0; for (auto &ii : CGI->arguments()) {