tweak a few things for future sret work

Signed-off-by: Jade Abraham <[email protected]>

Author: jabraham17

compiler/codegen/cg-expr.cpp

@@ -2930,7 +2930,7 @@ static GenRet codegenCallExprInner(GenRet function,
       }
     }
 
-    if (CGI == nullptr && fnType != nullptr &&
+   if (CGI == nullptr && fnType != nullptr &&
         fnType->getReturnType()->isVoidTy() &&
         fnType->getNumParams() >= 1 &&
         func && func->hasStructRetAttr())

compiler/codegen/cg-symbol.cpp

@@ -2313,7 +2313,6 @@ codegenFunctionTypeLLVMImpl(
               // because retArg must be either the first or second arg
               // this will require more investigation
               // if (formalInfo->isRetArg() &&
-              //    isAggregateType(formalInfo->type()) &&
               //    llvm::isa<llvm::StructType>(valType)) {
               //   auto ptrType = formalInfo->type()->codegen().type;
               //   llvmAttachStructRetAttr(b, ptrType);
@@ -2364,7 +2363,6 @@ codegenFunctionTypeLLVMImpl(
         // because retArg must be either the first or second arg
         // this will require more investigation
         // if (formalInfo->isRetArg() &&
-        //     isAggregateType(formalInfo->type()) &&
         //     llvm::isa<llvm::StructType>(valType)) {
         //   auto ptrType = formalInfo->type()->codegen().type;
         //   llvmAttachStructRetAttr(b, ptrType);

compiler/llvm/llvmDebug.cpp

@@ -1238,11 +1238,11 @@ llvm::DISubroutineType* DebugData::getFunctionType(FnSymbol *function) {
     if (arg->name == astr__ln || arg->name == astr__fn)
       continue;
 
-    auto ty = getType(arg->type);
     if (isReturnByRef && arg->hasFlag(FLAG_RETARG)) {
-      retType = ty;
+      retType = getType(arg->type->getValType());
       continue;
     }
+    auto ty = getType(arg->type);
     if (isMethod && arg->name == astrThis) {
       auto NewTy = ty->cloneWithFlags(ty->getFlags() |
                                       llvm::DINode::FlagObjectPointer |
@@ -1421,6 +1421,14 @@ llvm::DIVariable* DebugData::constructFormalArg(ArgSymbol *argSym, unsigned ArgN
     flags |= llvm::DINode::FlagObjectPointer | llvm::DINode::FlagArtificial;
   }
 
+  if (argSym->name == astr__ln ||
+      argSym->name == astr__fn) {
+    return nullptr;
+  }
+  if (argSym->hasFlag(FLAG_RETARG)) {
+    return nullptr;
+  }
+
   auto diParameterVariable = dibuilder->createParameterVariable(
     defInfo.scope(),
     name,