Index: include/llvm/IR/Function.h =================================================================== --- include/llvm/IR/Function.h +++ include/llvm/IR/Function.h @@ -137,7 +137,13 @@ /// The particular intrinsic functions which correspond to this value are /// defined in llvm/Intrinsics.h. Intrinsic::ID getIntrinsicID() const LLVM_READONLY { return IntID; } - bool isIntrinsic() const { return getName().startswith("llvm."); } + bool isIntrinsic() const { + // Intrinsic::not_intrinsic must be 0. + return IntID != 0; + } + /// Return true if the function's name starts with "llvm.". All intrinsics + /// have this prefix. + bool hasIntrinsicLikeName() const { return getName().startswith("llvm."); } /// \brief Recalculate the ID for this function if it is an Intrinsic defined /// in llvm/Intrinsics.h. Sets the intrinsic ID to Intrinsic::not_intrinsic Index: lib/CodeGen/WinEHPrepare.cpp =================================================================== --- lib/CodeGen/WinEHPrepare.cpp +++ lib/CodeGen/WinEHPrepare.cpp @@ -949,10 +949,14 @@ continue; // Skip call sites which are nounwind intrinsics or inline asm. + // + // FIXME: Should this check isIntrinsic() instead of + // hasIntrinsicLikeName? The latter is conservative. auto *CalledFn = dyn_cast(CS.getCalledValue()->stripPointerCasts()); - if (CalledFn && ((CalledFn->isIntrinsic() && CS.doesNotThrow()) || - CS.isInlineAsm())) + if (CalledFn && + ((CalledFn->hasIntrinsicLikeName() && CS.doesNotThrow()) || + CS.isInlineAsm())) continue; // This call site was not part of this funclet, remove it. Index: lib/IR/AsmWriter.cpp =================================================================== --- lib/IR/AsmWriter.cpp +++ lib/IR/AsmWriter.cpp @@ -905,7 +905,7 @@ // Process metadata used directly by intrinsics. if (const CallInst *CI = dyn_cast(&I)) if (Function *F = CI->getCalledFunction()) - if (F->isIntrinsic()) + if (F->hasIntrinsicLikeName()) for (auto &Op : I.operands()) if (auto *V = dyn_cast_or_null(Op)) if (MDNode *N = dyn_cast(V->getMetadata())) @@ -3377,7 +3377,7 @@ static bool isReferencingMDNode(const Instruction &I) { if (const auto *CI = dyn_cast(&I)) if (Function *F = CI->getCalledFunction()) - if (F->isIntrinsic()) + if (F->hasIntrinsicLikeName()) for (auto &Op : I.operands()) if (auto *V = dyn_cast_or_null(Op)) if (isa(V->getMetadata())) Index: lib/IR/Function.cpp =================================================================== --- lib/IR/Function.cpp +++ lib/IR/Function.cpp @@ -481,7 +481,7 @@ void Function::recalculateIntrinsicID() { const ValueName *ValName = this->getValueName(); - if (!ValName || !isIntrinsic()) { + if (!ValName || !ValName->first().startswith("llvm.")) { IntID = Intrinsic::not_intrinsic; return; } Index: lib/IR/Verifier.cpp =================================================================== --- lib/IR/Verifier.cpp +++ lib/IR/Verifier.cpp @@ -3624,7 +3624,7 @@ // Check to make sure that the "address of" an intrinsic function is never // taken. Assert( - !F->isIntrinsic() || + !F->hasIntrinsicLikeName() || i == (isa(I) ? e - 1 : isa(I) ? e - 3 : 0), "Cannot take the address of an intrinsic!", &I); Assert(