Index: include/llvm/Analysis/LibCallSemantics.h =================================================================== --- include/llvm/Analysis/LibCallSemantics.h +++ include/llvm/Analysis/LibCallSemantics.h @@ -29,6 +29,7 @@ MSVC_X86SEH, MSVC_Win64SEH, MSVC_CXX, + CoreCLR }; /// \brief See if the given exception handling personality function is one @@ -50,14 +51,14 @@ llvm_unreachable("invalid enum"); } - /// \brief Returns true if this is an MSVC personality function. - inline bool isMSVCEHPersonality(EHPersonality Pers) { - // The two SEH personality functions can catch asynch exceptions. We assume - // unknown personalities don't catch asynch exceptions. + /// \brief Returns true if this is a personality function that processes + /// Windows CFI. + inline bool isWinCFIPersonality(EHPersonality Pers) { switch (Pers) { case EHPersonality::MSVC_CXX: case EHPersonality::MSVC_X86SEH: case EHPersonality::MSVC_Win64SEH: + case EHPersonality::CoreCLR: return true; default: return false; } Index: lib/Analysis/LibCallSemantics.cpp =================================================================== --- lib/Analysis/LibCallSemantics.cpp +++ lib/Analysis/LibCallSemantics.cpp @@ -34,6 +34,7 @@ .Case("_except_handler4", EHPersonality::MSVC_X86SEH) .Case("__C_specific_handler", EHPersonality::MSVC_Win64SEH) .Case("__CxxFrameHandler3", EHPersonality::MSVC_CXX) + .Case("ProcessCLRException", EHPersonality::CoreCLR) .Default(EHPersonality::Unknown); } Index: lib/CodeGen/AsmPrinter/WinException.cpp =================================================================== --- lib/CodeGen/AsmPrinter/WinException.cpp +++ lib/CodeGen/AsmPrinter/WinException.cpp @@ -113,10 +113,10 @@ if (F->hasPersonalityFn()) Per = classifyEHPersonality(F->getPersonalityFn()); - // Get rid of any dead landing pads if we're not using a Windows EH scheme. In + // Get rid of any dead landing pads if we're not using Windows CFI. In // Windows EH schemes, the landing pad is not actually reachable. It only // exists so that we can emit the right table data. - if (!isMSVCEHPersonality(Per)) + if (!isWinCFIPersonality(Per)) MMI->TidyLandingPads(); endFunclet(); Index: lib/CodeGen/DwarfEHPrepare.cpp =================================================================== --- lib/CodeGen/DwarfEHPrepare.cpp +++ lib/CodeGen/DwarfEHPrepare.cpp @@ -192,9 +192,9 @@ if (Resumes.empty()) return false; - // Check the personality, don't do anything if it's for MSVC. + // Check the personality, don't do anything if it's for WinEH. EHPersonality Pers = classifyEHPersonality(Fn.getPersonalityFn()); - if (isMSVCEHPersonality(Pers)) + if (isWinCFIPersonality(Pers)) return false; LLVMContext &Ctx = Fn.getContext(); Index: lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp =================================================================== --- lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp +++ lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp @@ -273,11 +273,11 @@ LPads.push_back(LPI); } - // If this is an MSVC EH personality, we need to do a bit more work. + // If this personality uses Windows CFI, we need to do a bit more work. if (!Fn->hasPersonalityFn()) return; EHPersonality Personality = classifyEHPersonality(Fn->getPersonalityFn()); - if (!isMSVCEHPersonality(Personality)) + if (!isWinCFIPersonality(Personality)) return; if (Personality == EHPersonality::MSVC_Win64SEH || Index: lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp =================================================================== --- lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -1207,8 +1207,10 @@ findUnwindDestinations(FunctionLoweringInfo &FuncInfo, const BasicBlock *EHPadBB, SmallVectorImpl &UnwindDests) { - bool IsMSVCCXX = classifyEHPersonality(FuncInfo.Fn->getPersonalityFn()) == - EHPersonality::MSVC_CXX; + EHPersonality Personality = + classifyEHPersonality(FuncInfo.Fn->getPersonalityFn()); + bool IsMSVCCXX = Personality == EHPersonality::MSVC_CXX; + bool IsCoreCLR = Personality == EHPersonality::CoreCLR; while (EHPadBB) { const Instruction *Pad = EHPadBB->getFirstNonPHI(); if (isa(Pad)) { @@ -1224,8 +1226,8 @@ } else if (const auto *CPI = dyn_cast(Pad)) { // Add the catchpad handler to the possible destinations. UnwindDests.push_back(FuncInfo.MBBMap[CPI->getNormalDest()]); - // In MSVC C++, catchblocks are funclets and need prologues. - if (IsMSVCCXX) + // In MSVC C++ and CoreCLR, catchblocks are funclets and need prologues. + if (IsMSVCCXX || IsCoreCLR) UnwindDests.back()->setIsEHFuncletEntry(); EHPadBB = CPI->getUnwindDest(); } else if (const auto *CEPI = dyn_cast(Pad)) { Index: lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp =================================================================== --- lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -941,7 +941,7 @@ BuildMI(*MBB, FuncInfo->InsertPt, SDB->getCurDebugLoc(), II) .addSym(Label); - // If this is an MSVC-style personality function, we need to split the landing + // If this personality function uses Windows CFI, we need to split the landing // pad into several BBs. const BasicBlock *LLVMBB = MBB->getBasicBlock(); const Constant *Personality = MF->getFunction()->getPersonalityFn(); @@ -949,7 +949,7 @@ MF->getMMI().addPersonality(PF); EHPersonality PersonalityType = classifyEHPersonality(Personality); - if (isMSVCEHPersonality(PersonalityType)) { + if (isWinCFIPersonality(PersonalityType)) { SmallVector ClauseBBs; const IntrinsicInst *ActionsCall = dyn_cast(LLVMBB->getFirstInsertionPt()); Index: lib/CodeGen/WinEHPrepare.cpp =================================================================== --- lib/CodeGen/WinEHPrepare.cpp +++ lib/CodeGen/WinEHPrepare.cpp @@ -433,8 +433,8 @@ // Classify the personality to see what kind of preparation we need. Personality = classifyEHPersonality(Fn.getPersonalityFn()); - // Do nothing if this is not an MSVC personality. - if (!isMSVCEHPersonality(Personality)) + // Do nothing if this is not a Windows-style personality. + if (!isWinCFIPersonality(Personality)) return false; SmallVector LPads; Index: lib/Target/X86/X86ISelLowering.cpp =================================================================== --- lib/Target/X86/X86ISelLowering.cpp +++ lib/Target/X86/X86ISelLowering.cpp @@ -3390,7 +3390,7 @@ const uint32_t *Mask = RegInfo->getCallPreservedMask(MF, CallConv); assert(Mask && "Missing call preserved mask for calling convention"); - // If this is an invoke in a 32-bit function using an MSVC personality, assume + // If this is an invoke in a 32-bit function using a WinCFI personality, assume // the function clobbers all registers. If an exception is thrown, the runtime // will not restore CSRs. // FIXME: Model this more precisely so that we can register allocate across @@ -3401,7 +3401,7 @@ CallerFn->hasPersonalityFn() ? classifyEHPersonality(CallerFn->getPersonalityFn()) : EHPersonality::Unknown; - if (isMSVCEHPersonality(Pers)) + if (isWinCFIPersonality(Pers)) Mask = RegInfo->getNoPreservedMask(); } Index: lib/Target/X86/X86WinEHState.cpp =================================================================== --- lib/Target/X86/X86WinEHState.cpp +++ lib/Target/X86/X86WinEHState.cpp @@ -156,7 +156,7 @@ if (WinEHParentName != F.getName() && !WinEHParentName.empty()) return false; - // Check the personality. Do nothing if this is not an MSVC personality. + // Check the personality. Do nothing if this personality doesn't use WinCFI. if (!F.hasPersonalityFn()) return false; PersonalityFn = @@ -164,7 +164,7 @@ if (!PersonalityFn) return false; Personality = classifyEHPersonality(PersonalityFn); - if (!isMSVCEHPersonality(Personality)) + if (!isWinCFIPersonality(Personality)) return false; // Skip this function if there are no EH pads and we aren't using IR-level Index: lib/Transforms/InstCombine/InstructionCombining.cpp =================================================================== --- lib/Transforms/InstCombine/InstructionCombining.cpp +++ lib/Transforms/InstCombine/InstructionCombining.cpp @@ -2362,6 +2362,7 @@ case EHPersonality::MSVC_X86SEH: case EHPersonality::MSVC_Win64SEH: case EHPersonality::MSVC_CXX: + case EHPersonality::CoreCLR: return TypeInfo->isNullValue(); } llvm_unreachable("invalid enum");