static std::pair<SanitizerKind::SanitizerOrdinal, llvm::SanitizerStatKind> ParseCFITypeCheckKind(CFITypeCheckKind TCK);

Author: thurstond

clang/lib/CodeGen/CGClass.cpp

@@ -2779,9 +2779,11 @@ void CodeGenFunction::EmitTypeMetadataCodeForVCall(const CXXRecordDecl *RD,
   }
 }
 
-void CodeGenFunction::ParseCFITypeCheckKind(CFITypeCheckKind TCK,
-                                            SanitizerKind::SanitizerOrdinal &M,
-                                            llvm::SanitizerStatKind &SSK) {
+std::pair<SanitizerKind::SanitizerOrdinal, llvm::SanitizerStatKind>
+CodeGenFunction::ParseCFITypeCheckKind(CFITypeCheckKind TCK) {
+  SanitizerKind::SanitizerOrdinal M;
+  llvm::SanitizerStatKind SSK;
+
   switch (TCK) {
   case CFITCK_VCall:
     M = SanitizerKind::SO_CFIVCall;
@@ -2807,6 +2809,8 @@ void CodeGenFunction::ParseCFITypeCheckKind(CFITypeCheckKind TCK,
   case CFITCK_VMFCall:
     llvm_unreachable("unexpected sanitizer kind");
   }
+
+  return std::make_pair(M, SSK);
 }
 
 void CodeGenFunction::EmitVTablePtrCheckForCall(const CXXRecordDecl *RD,
@@ -2816,10 +2820,9 @@ void CodeGenFunction::EmitVTablePtrCheckForCall(const CXXRecordDecl *RD,
   if (!SanOpts.has(SanitizerKind::CFICastStrict))
     RD = LeastDerivedClassWithSameLayout(RD);
 
-  SanitizerKind::SanitizerOrdinal Ordinal;
-  llvm::SanitizerStatKind SSK;
-  ParseCFITypeCheckKind(TCK, Ordinal, SSK);
+  auto [Ordinal, SSK] = ParseCFITypeCheckKind(TCK);
   ApplyDebugLocation ApplyTrapDI(*this, SanitizerAnnotateDebugInfo(Ordinal));
+
   EmitVTablePtrCheck(RD, VTable, TCK, Loc);
 }
 
@@ -2842,9 +2845,7 @@ void CodeGenFunction::EmitVTablePtrCheckForCast(QualType T, Address Derived,
   if (!SanOpts.has(SanitizerKind::CFICastStrict))
     ClassDecl = LeastDerivedClassWithSameLayout(ClassDecl);
 
-  SanitizerKind::SanitizerOrdinal Ordinal;
-  llvm::SanitizerStatKind SSK;
-  ParseCFITypeCheckKind(TCK, Ordinal, SSK);
+  auto [Ordinal, SSK] = ParseCFITypeCheckKind(TCK);
   ApplyDebugLocation ApplyTrapDI(*this, SanitizerAnnotateDebugInfo(Ordinal));
 
   llvm::BasicBlock *ContBlock = nullptr;
@@ -2881,9 +2882,7 @@ void CodeGenFunction::EmitVTablePtrCheck(const CXXRecordDecl *RD,
       !CGM.HasHiddenLTOVisibility(RD))
     return;
 
-  SanitizerKind::SanitizerOrdinal M;
-  llvm::SanitizerStatKind SSK;
-  ParseCFITypeCheckKind(TCK, M, SSK);
+  auto [M, SSK] = ParseCFITypeCheckKind(TCK);
   switch (TCK) {
   case CFITCK_VCall:
   case CFITCK_NVCall:

clang/lib/CodeGen/CodeGenFunction.h

@@ -3365,9 +3365,8 @@ class CodeGenFunction : public CodeGenTypeCache {
 
   /// Converts the CFITypeCheckKind into SanitizerKind::SanitizerOrdinal and
   /// llvm::SanitizerStatKind.
-  void ParseCFITypeCheckKind(CFITypeCheckKind TCK,
-                             SanitizerKind::SanitizerOrdinal &M,
-                             llvm::SanitizerStatKind &SSK);
+  static std::pair<SanitizerKind::SanitizerOrdinal, llvm::SanitizerStatKind>
+  ParseCFITypeCheckKind(CFITypeCheckKind TCK);
 
   /// Emit a check that \p Base points into an array object, which
   /// we can access at index \p Index. \p Accessed should be \c false if we