Rebase cleanup

Author: thurstond

clang/lib/CodeGen/CGClass.cpp

@@ -2805,8 +2805,6 @@ SanitizerInfoFromCFICheckKind(CodeGenFunction::CFITypeCheckKind TCK) {
   case CodeGenFunction::CFITCK_VMFCall:
     llvm_unreachable("unexpected sanitizer kind");
   }
-
-  return std::make_pair(M, SSK);
 }
 
 void CodeGenFunction::EmitVTablePtrCheckForCall(const CXXRecordDecl *RD,
@@ -2816,7 +2814,7 @@ void CodeGenFunction::EmitVTablePtrCheckForCall(const CXXRecordDecl *RD,
   if (!SanOpts.has(SanitizerKind::CFICastStrict))
     RD = LeastDerivedClassWithSameLayout(RD);
 
-  auto [Ordinal, SSK] = ParseCFITypeCheckKind(TCK);
+  auto [Ordinal, SSK] = SanitizerInfoFromCFICheckKind(TCK);
   ApplyDebugLocation ApplyTrapDI(*this, SanitizerAnnotateDebugInfo(Ordinal));
 
   EmitVTablePtrCheck(RD, VTable, TCK, Loc);
@@ -2841,7 +2839,7 @@ void CodeGenFunction::EmitVTablePtrCheckForCast(QualType T, Address Derived,
   if (!SanOpts.has(SanitizerKind::CFICastStrict))
     ClassDecl = LeastDerivedClassWithSameLayout(ClassDecl);
 
-  auto [Ordinal, SSK] = ParseCFITypeCheckKind(TCK);
+  auto [Ordinal, SSK] = SanitizerInfoFromCFICheckKind(TCK);
   ApplyDebugLocation ApplyTrapDI(*this, SanitizerAnnotateDebugInfo(Ordinal));
 
   llvm::BasicBlock *ContBlock = nullptr;

clang/lib/CodeGen/CodeGenFunction.h

@@ -3353,11 +3353,6 @@ class CodeGenFunction : public CodeGenTypeCache {
                      SanitizerSet SkippedChecks = SanitizerSet(),
                      llvm::Value *ArraySize = nullptr);
 
-  /// Converts the CFITypeCheckKind into SanitizerKind::SanitizerOrdinal and
-  /// llvm::SanitizerStatKind.
-  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
   /// this expression is used as an lvalue, for instance in "&Arr[Idx]".