Remove static function from header

Author: thurstond

clang/lib/CodeGen/CGClass.cpp

@@ -2779,31 +2779,33 @@ void CodeGenFunction::EmitTypeMetadataCodeForVCall(const CXXRecordDecl *RD,
   }
 }
 
-std::pair<SanitizerKind::SanitizerOrdinal, llvm::SanitizerStatKind>
-CodeGenFunction::ParseCFITypeCheckKind(CFITypeCheckKind TCK) {
+/// Converts the CFITypeCheckKind into SanitizerKind::SanitizerOrdinal and
+/// llvm::SanitizerStatKind.
+static std::pair<SanitizerKind::SanitizerOrdinal, llvm::SanitizerStatKind>
+ParseCFITypeCheckKind(CodeGenFunction::CFITypeCheckKind TCK) {
   SanitizerKind::SanitizerOrdinal M;
   llvm::SanitizerStatKind SSK;
 
   switch (TCK) {
-  case CFITCK_VCall:
+  case CodeGenFunction::CFITCK_VCall:
     M = SanitizerKind::SO_CFIVCall;
     SSK = llvm::SanStat_CFI_VCall;
     break;
-  case CFITCK_NVCall:
+  case CodeGenFunction::CFITCK_NVCall:
     M = SanitizerKind::SO_CFINVCall;
     SSK = llvm::SanStat_CFI_NVCall;
     break;
-  case CFITCK_DerivedCast:
+  case CodeGenFunction::CFITCK_DerivedCast:
     M = SanitizerKind::SO_CFIDerivedCast;
     SSK = llvm::SanStat_CFI_DerivedCast;
     break;
-  case CFITCK_UnrelatedCast:
+  case CodeGenFunction::CFITCK_UnrelatedCast:
     M = SanitizerKind::SO_CFIUnrelatedCast;
     SSK = llvm::SanStat_CFI_UnrelatedCast;
     break;
-  case CFITCK_ICall:
-  case CFITCK_NVMFCall:
-  case CFITCK_VMFCall:
+  case CodeGenFunction::CFITCK_ICall:
+  case CodeGenFunction::CFITCK_NVMFCall:
+  case CodeGenFunction::CFITCK_VMFCall:
     llvm_unreachable("unexpected sanitizer kind");
   }
 

clang/lib/CodeGen/CodeGenFunction.h

@@ -3358,11 +3358,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]".