From 7ef47a67a5ced2e7aa5a9b9f77eaeeb376e0583e Mon Sep 17 00:00:00 2001 From: Alexey Bataev Date: Thu, 22 Feb 2018 18:33:31 +0000 Subject: [OPENMP] Require valid SourceLocation in function call, NFC. Removed default empty SourceLocation argument from `emitCall` function and require valid location. llvm-svn: 325812 --- clang/lib/CodeGen/CGOpenMPRuntime.cpp | 10 +++++----- clang/lib/CodeGen/CGOpenMPRuntime.h | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'clang/lib/CodeGen') diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp index 1eae838ed99..83cc45b7fa8 100644 --- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp +++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp @@ -8057,9 +8057,10 @@ void CGOpenMPRuntime::emitDoacrossOrdered(CodeGenFunction &CGF, CGF.EmitRuntimeCall(RTLFn, Args); } -void CGOpenMPRuntime::emitCall(CodeGenFunction &CGF, llvm::Value *Callee, - ArrayRef Args, - SourceLocation Loc) const { +void CGOpenMPRuntime::emitCall(CodeGenFunction &CGF, SourceLocation Loc, + llvm::Value *Callee, + ArrayRef Args) const { + assert(Loc.isValid() && "Outlined function call location must be valid."); auto DL = ApplyDebugLocation::CreateDefaultArtificial(CGF, Loc); if (auto *Fn = dyn_cast(Callee)) { @@ -8074,8 +8075,7 @@ void CGOpenMPRuntime::emitCall(CodeGenFunction &CGF, llvm::Value *Callee, void CGOpenMPRuntime::emitOutlinedFunctionCall( CodeGenFunction &CGF, SourceLocation Loc, llvm::Value *OutlinedFn, ArrayRef Args) const { - assert(Loc.isValid() && "Outlined function call location must be valid."); - emitCall(CGF, OutlinedFn, Args, Loc); + emitCall(CGF, Loc, OutlinedFn, Args); } Address CGOpenMPRuntime::getParameterAddress(CodeGenFunction &CGF, diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.h b/clang/lib/CodeGen/CGOpenMPRuntime.h index e1ba8334368..046228e7e24 100644 --- a/clang/lib/CodeGen/CGOpenMPRuntime.h +++ b/clang/lib/CodeGen/CGOpenMPRuntime.h @@ -251,9 +251,8 @@ protected: virtual StringRef getOutlinedHelperName() const { return ".omp_outlined."; } /// Emits \p Callee function call with arguments \p Args with location \p Loc. - void emitCall(CodeGenFunction &CGF, llvm::Value *Callee, - ArrayRef Args = llvm::None, - SourceLocation Loc = SourceLocation()) const; + void emitCall(CodeGenFunction &CGF, SourceLocation Loc, llvm::Value *Callee, + ArrayRef Args = llvm::None) const; private: /// \brief Default const ident_t object used for initialization of all other -- cgit v1.2.3