From 67eec5325a1ab99d493fd7e0381d20aab19b286e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 5 Feb 2022 21:07:43 +0100 Subject: Merge llvm-project main llvmorg-14-init-18294-gdb01b123d012 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-14-init-18294-gdb01b123d012, the last commit before the upstream release/14.x branch was created. PR: 261742 MFC after: 2 weeks (cherry picked from commit 1fd87a682ad7442327078e1eeb63edc4258f9815) --- contrib/llvm-project/llvm/lib/Transforms/Utils/CodeExtractor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'contrib/llvm-project/llvm/lib/Transforms/Utils/CodeExtractor.cpp') diff --git a/contrib/llvm-project/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/contrib/llvm-project/llvm/lib/Transforms/Utils/CodeExtractor.cpp index 24cd5747c5a4..cec159f6a448 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -33,6 +33,7 @@ #include "llvm/IR/Constants.h" #include "llvm/IR/DIBuilder.h" #include "llvm/IR/DataLayout.h" +#include "llvm/IR/DebugInfo.h" #include "llvm/IR/DebugInfoMetadata.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/IR/Dominators.h" @@ -857,8 +858,8 @@ Function *CodeExtractor::constructFunction(const ValueSet &inputs, (ParamTy.size() + AggParamTy.size()) == (inputs.size() + outputs.size()) && "Number of scalar and aggregate params does not match inputs, outputs"); - assert(StructValues.empty() || - AggregateArgs && "Expeced StructValues only with AggregateArgs set"); + assert((StructValues.empty() || AggregateArgs) && + "Expeced StructValues only with AggregateArgs set"); // Concatenate scalar and aggregate params in ParamTy. size_t NumScalarParams = ParamTy.size(); -- cgit v1.2.3