Rebase patchset

Created using spr 1.3.6-beta.1
llvm · Prabhuk · Apr 3, 2024 · Apr 22, 2024 · Apr 22, 2024 · Apr 24, 2024
commit 179f9302a447f93d01d8c0b07136e2a3d456c88f
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
@@ -5702,9 +5702,11 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
  if (CGM.getCodeGenOpts().CallGraphSection) {
    // Create operand bundle only for indirect calls, not for all
    if (callOrInvoke && *callOrInvoke && (*callOrInvoke)->isIndirectCall()) {
+
      assert((TargetDecl && TargetDecl->getFunctionType() ||
              Callee.getAbstractInfo().getCalleeFunctionProtoType()) &&
             "cannot find callsite type");
+
      QualType CST;
      if (TargetDecl && TargetDecl->getFunctionType())
        CST = QualType(TargetDecl->getFunctionType(), 0);

diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp
@@ -2217,9 +2217,8 @@ CGObjCCommonMac::EmitMessageSend(CodeGen::CodeGenFunction &CGF,

  llvm::CallBase *CallSite;
  CGCallee Callee = CGCallee::forDirect(BitcastFn);
-  RValue rvalue = CGF.EmitCall(MSI.CallInfo, Callee, Return, ActualArgs,
-                               &CallSite);
-
+  RValue rvalue =
+      CGF.EmitCall(MSI.CallInfo, Callee, Return, ActualArgs, &CallSite);
  // Mark the call as noreturn if the method is marked noreturn and the
  // receiver cannot be null.
  if (Method && Method->hasAttr<NoReturnAttr>() && !ReceiverCanBeNull) {

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -3331,7 +3331,7 @@ void SelectionDAGBuilder::visitInvoke(const InvokeInst &I) {
  assert(!I.hasOperandBundlesOtherThan(
             {LLVMContext::OB_deopt, LLVMContext::OB_gc_transition,
              LLVMContext::OB_gc_live, LLVMContext::OB_funclet,
-              LLVMContext::OB_cfguardtarget,
+              LLVMContext::OB_cfguardtarget, LLVMContext::OB_ptrauth,
              LLVMContext::OB_clang_arc_attachedcall, LLVMContext::OB_type}) &&
         "Cannot lower invokes with arbitrary operand bundles yet!");


diff --git a/llvm/test/Bitcode/operand-bundles-bc-analyzer.ll b/llvm/test/Bitcode/operand-bundles-bc-analyzer.ll
@@ -32,4 +32,4 @@ define void @f0(ptr %ptr) {
  %x = add i32 42, 1
  call void @callee0() [ "foo"(i32 42, i64 100, i32 %x), "bar"(float  0.000000e+00, i64 100, i32 %l) ]
  ret void
-}
+}