[CHERIoT] Pass two-cap-sized return values and arguments in registers

Author: xdoardo

clang/lib/CodeGen/Targets/RISCV.cpp

@@ -429,9 +429,35 @@ ABIArgInfo RISCVABIInfo::classifyArgumentType(QualType Ty, bool IsFixed,
     return ABIArgInfo::getIgnore();
 
   bool IsSingleCapRecord = false;
-  if (auto *RT = Ty->getAs<RecordType>())
+  bool FitsInTwoRegs = false;
+  if (auto *RT = dyn_cast<RecordDecl>(Ty->getAsTagDecl())) {
     IsSingleCapRecord = Size == getTarget().getCHERICapabilityWidth() &&
-                        getContext().containsCapabilities(RT->getDecl());
+                        getContext().containsCapabilities(RT);
+    FitsInTwoRegs = IsSingleCapRecord;
+
+    // Check if the record fits in two registers, that is:
+    // 1. it has two fields
+    // 2. any of the two fields is either a capability or a type whose size can
+    // fit in the data part of a register
+    if (!IsSingleCapRecord) {
+      FitsInTwoRegs = true;
+      int SeenFields = 0;
+      for (const FieldDecl *Field : RT->fields()) {
+        if (++SeenFields > 2) {
+          FitsInTwoRegs = false;
+          break;
+        }
+
+        auto FieldTy = Field->getType();
+        auto FieldInfo = Field->getASTContext().getTypeInfo(FieldTy);
+        if (!FieldTy->isAnyPointerType() &&
+            FieldInfo.Width > getTarget().getRegisterWidth()) {
+          FitsInTwoRegs = false;
+          break;
+        }
+      }
+    }
+  }
 
   bool IsCapability = Ty->isCHERICapabilityType(getContext()) ||
                       IsSingleCapRecord;
@@ -528,7 +554,7 @@ ABIArgInfo RISCVABIInfo::classifyArgumentType(QualType Ty, bool IsFixed,
     return ABIArgInfo::getDirect();
   }
 
-  if (IsSingleCapRecord)
+  if (FitsInTwoRegs)
     return ABIArgInfo::getDirect();
 
   if (const VectorType *VT = Ty->getAs<VectorType>())