[LLVMABI] Refactor

Author: vortex73

APFloat.o

@@ -33,10 +33,9 @@ class QualTypeMapper {
   clang::ASTContext &ASTCtx;
   llvm::abi::TypeBuilder Builder;
 
-  llvm::DenseMap<clang::QualType, const llvm::abi::Type *> TypeCache;
+  llvm::DenseMap<QualType, const llvm::abi::Type *> TypeCache;
 
-  const llvm::abi::Type *convertBuiltinType(const clang::BuiltinType *BT,
-                                            bool InMemory = false);
+  const llvm::abi::Type *convertBuiltinType(const clang::BuiltinType *BT);
   const llvm::abi::Type *convertPointerType(const clang::PointerType *PT);
   const llvm::abi::Type *convertArrayType(const clang::ArrayType *AT);
   const llvm::abi::Type *convertVectorType(const clang::VectorType *VT);
@@ -48,12 +47,12 @@ class QualTypeMapper {
   convertMemberPointerType(const clang::MemberPointerType *MPT);
   const llvm::abi::Type *convertMatrixType(const ConstantMatrixType *MT);
 
-  const llvm::abi::StructType *convertStructType(const clang::RecordDecl *RD);
-  const llvm::abi::StructType *convertUnionType(const clang::RecordDecl *RD,
-                                                bool isTransparent = false);
+  const llvm::abi::RecordType *convertStructType(const clang::RecordDecl *RD);
+  const llvm::abi::RecordType *convertUnionType(const clang::RecordDecl *RD,
+                                                bool IsTransparent = false);
   const llvm::abi::Type *createPointerTypeForPointee(QualType PointeeType);
-  const llvm::abi::StructType *convertCXXRecordType(const CXXRecordDecl *RD,
-                                                    bool canPassInRegs);
+  const llvm::abi::RecordType *convertCXXRecordType(const CXXRecordDecl *RD,
+                                                    bool CanPassInRegs);
 
   void computeFieldInfo(const clang::RecordDecl *RD,
                         SmallVectorImpl<llvm::abi::FieldInfo> &Fields,
@@ -69,7 +68,7 @@ class QualTypeMapper {
   explicit QualTypeMapper(clang::ASTContext &Ctx, llvm::BumpPtrAllocator &Alloc)
       : ASTCtx(Ctx), Builder(Alloc) {}
 
-  const llvm::abi::Type *convertType(clang::QualType QT, bool InMemory = false);
+  const llvm::abi::Type *convertType(clang::QualType QT);
 
   void clearCache() { TypeCache.clear(); }
 

clang/include/clang/CodeGen/QualTypeMapper.h

@@ -46,8 +46,6 @@
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/Type.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/raw_ostream.h"
 #include "llvm/TargetParser/Triple.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include <optional>
@@ -1055,13 +1053,13 @@ const CGFunctionInfo &CodeGenTypes::arrangeLLVMFunctionInfo(
   FI = CGFunctionInfo::create(CC, isInstanceMethod, isChainCall, isDelegateCall,
                               info, paramInfos, resultType, argTypes, required);
 
+  FunctionInfos.InsertNode(FI, insertPos);
   std::unique_ptr<llvm::abi::ABIFunctionInfo> tempFI;
 
   bool inserted = FunctionsBeingProcessed.insert(FI).second;
   (void)inserted;
   assert(inserted && "Recursively being processed?");
 
-
   // Compute ABI information.
   if (CC == llvm::CallingConv::SPIR_KERNEL) {
     // Force target independent argument handling for the host visible
@@ -1070,24 +1068,25 @@ const CGFunctionInfo &CodeGenTypes::arrangeLLVMFunctionInfo(
   } else if (info.getCC() == CC_Swift || info.getCC() == CC_SwiftAsync) {
     swiftcall::computeABIInfo(CGM, *FI);
   } else {
-    if (CGM.shouldUseLLVMABI()) {
+    if (CGM.shouldUseLLVMABI() &&
+        (CC == llvm::CallingConv::X86_64_SysV || CC == llvm::CallingConv::C)) {
       SmallVector<const llvm::abi::Type *, 8> MappedArgTypes;
       for (CanQualType ArgType : argTypes)
         MappedArgTypes.push_back(Mapper.convertType(ArgType));
       tempFI.reset(llvm::abi::ABIFunctionInfo::create(
           CC, Mapper.convertType(resultType), MappedArgTypes));
-      FunctionInfos.InsertNode(FI, insertPos);
 
       CGM.fetchABIInfo(TB).computeInfo(*tempFI);
-    } else 
+    } else
       CGM.getABIInfo().computeInfo(*FI);
   }
 
-
   // Loop over all of the computed argument and return value info.  If any of
   // them are direct or extend without a specified coerce type, specify the
   // default now.
-  if (CGM.shouldUseLLVMABI() && tempFI) {
+  if (CGM.shouldUseLLVMABI() &&
+      (CC == llvm::CallingConv::X86_64_SysV || CC == llvm::CallingConv::C) &&
+      tempFI) {
 
     const auto &abiRetInfo = tempFI->getReturnInfo();
     ABIArgInfo &cgRetInfo = FI->getReturnInfo();

clang/lib/CodeGen/CGCall.cpp

@@ -470,12 +470,11 @@ CodeGenModule::CodeGenModule(ASTContext &C,
       SanitizerMD(new SanitizerMetadata(*this)),
       AtomicOpts(Target.getAtomicOpts()) {
 
-
   // Flag to use the new LLVM ABI Library :)
   const llvm::Triple &Triple = Target.getTriple();
-  ShouldUseLLVMABI = Triple.isBPF() || 
-                    (Triple.getArch() == llvm::Triple::x86_64 && 
-                     Triple.isOSLinux());
+  ShouldUseLLVMABI =
+      Triple.isBPF() ||
+      (Triple.getArch() == llvm::Triple::x86_64 && Triple.isOSLinux());
   // Initialize the type cache.
   Types.reset(new CodeGenTypes(*this));
   llvm::LLVMContext &LLVMContext = M.getContext();

clang/lib/CodeGen/CodeGenModule.cpp

@@ -27,7 +27,6 @@
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Module.h"
-#include "llvm/Support/Error.h"
 
 using namespace clang;
 using namespace CodeGen;

clang/lib/CodeGen/CodeGenTypes.cpp

@@ -99,7 +99,7 @@ class CodeGenTypes {
   mutable llvm::BumpPtrAllocator Alloc;
   mutable llvm::abi::TypeBuilder TB;
   mutable QualTypeMapper Mapper;
-  llvm::ABITypeMapper ReverseMapper;
+  llvm::abi::ABITypeMapper ReverseMapper;
 
 public:
   CodeGenTypes(CodeGenModule &cgm);