This is an archive of the discontinued LLVM Phabricator instance.

Differential D99617

[OPENMP]Fix PR48607: Crash during clang openmp codegen for firstprivate() of `float _Complex`.
ClosedPublic

Authored by ABataev on Mar 30 2021, 1:15 PM.

Details

Reviewers
jdoerfert
Commits
rGe2c7bf08cc8e: [OPENMP]Fix PR48607: Crash during clang openmp codegen for firstprivate() of…
Summary

Need to cast the argument for the debug wrapper function call to the
corresponding parameter type to avoid crash.

Diff Detail

Event Timeline

ABataev created this revision.Mar 30 2021, 1:15 PM
Herald added subscribers: guansong, yaxunl. · View Herald TranscriptMar 30 2021, 1:15 PM
ABataev requested review of this revision.Mar 30 2021, 1:15 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 30 2021, 1:15 PM
Herald added a subscriber: sstefan1. · View Herald Transcript
jdoerfert accepted this revision.Mar 30 2021, 1:37 PM

LG, one nit.

clang/lib/CodeGen/CGStmtOpenMP.cpp
644

leftover?

This revision is now accepted and ready to land.Mar 30 2021, 1:37 PM
ABataev added inline comments.Mar 30 2021, 1:38 PM
clang/lib/CodeGen/CGStmtOpenMP.cpp
644

yes, need to restore original code here

This revision was landed with ongoing or failed builds.Mar 30 2021, 1:44 PM
Closed by commit rGe2c7bf08cc8e: [OPENMP]Fix PR48607: Crash during clang openmp codegen for firstprivate() of… (authored by ABataev). · Explain Why
This revision was automatically updated to reflect the committed changes.
ABataev added a commit: rGe2c7bf08cc8e: [OPENMP]Fix PR48607: Crash during clang openmp codegen for firstprivate() of….
Harbormaster completed remote builds in B96392: Diff 334257.Mar 30 2021, 2:13 PM

Revision Contents

PathSize
clang/
lib/
CodeGen/
7 lines
test/
OpenMP/
22 lines

Diff 334264

clang/lib/CodeGen/CGStmtOpenMP.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 628 Lines • ▼ Show 20 LinesCodeGenFunction::GenerateOpenMPCapturedStmtFunction(const CapturedStmt &S,
WrapperCGF.CapturedStmtInfo = CapturedStmtInfo; WrapperCGF.CapturedStmtInfo = CapturedStmtInfo;
Args.clear(); Args.clear();
LocalAddrs.clear(); LocalAddrs.clear();
VLASizes.clear(); VLASizes.clear();
llvm::Function *WrapperF = llvm::Function *WrapperF =
emitOutlinedFunctionPrologue(WrapperCGF, Args, LocalAddrs, VLASizes, emitOutlinedFunctionPrologue(WrapperCGF, Args, LocalAddrs, VLASizes,
WrapperCGF.CXXThisValue, WrapperFO); WrapperCGF.CXXThisValue, WrapperFO);
llvm::SmallVector<llvm::Value *, 4> CallArgs; llvm::SmallVector<llvm::Value *, 4> CallArgs;
auto *PI = F->arg_begin();
for (const auto *Arg : Args) { for (const auto *Arg : Args) {
llvm::Value *CallArg; llvm::Value *CallArg;
auto I = LocalAddrs.find(Arg); auto I = LocalAddrs.find(Arg);
if (I != LocalAddrs.end()) { if (I != LocalAddrs.end()) {
LValue LV = WrapperCGF.MakeAddrLValue( LValue LV = WrapperCGF.MakeAddrLValue(
I->second.second, I->second.second,
I->second.first ? I->second.first->getType() : Arg->getType(), I->second.first ? I->second.first->getType() : Arg->getType(),
jdoerfertUnsubmitted
Not Done
ReplyInline Actions

leftover?

jdoerfert: leftover?
ABataevAuthorUnsubmitted
Done
ReplyInline Actions

yes, need to restore original code here

ABataev: yes, need to restore original code here
AlignmentSource::Decl); AlignmentSource::Decl);
if (LV.getType()->isAnyComplexType())
LV.setAddress(WrapperCGF.Builder.CreatePointerBitCastOrAddrSpaceCast(
LV.getAddress(WrapperCGF),
PI->getType()->getPointerTo(
LV.getAddress(WrapperCGF).getAddressSpace())));
CallArg = WrapperCGF.EmitLoadOfScalar(LV, S.getBeginLoc()); CallArg = WrapperCGF.EmitLoadOfScalar(LV, S.getBeginLoc());
} else { } else {
auto EI = VLASizes.find(Arg); auto EI = VLASizes.find(Arg);
if (EI != VLASizes.end()) { if (EI != VLASizes.end()) {
CallArg = EI->second.second; CallArg = EI->second.second;
} else { } else {
LValue LV = WrapperCGF.MakeAddrLValue(WrapperCGF.GetAddrOfLocalVar(Arg), LValue LV = WrapperCGF.MakeAddrLValue(WrapperCGF.GetAddrOfLocalVar(Arg),
Arg->getType(), Arg->getType(),
AlignmentSource::Decl); AlignmentSource::Decl);
CallArg = WrapperCGF.EmitLoadOfScalar(LV, S.getBeginLoc()); CallArg = WrapperCGF.EmitLoadOfScalar(LV, S.getBeginLoc());
} }
} }
CallArgs.emplace_back(WrapperCGF.EmitFromMemory(CallArg, Arg->getType())); CallArgs.emplace_back(WrapperCGF.EmitFromMemory(CallArg, Arg->getType()));
++PI;
} }
CGM.getOpenMPRuntime().emitOutlinedFunctionCall(WrapperCGF, Loc, F, CallArgs); CGM.getOpenMPRuntime().emitOutlinedFunctionCall(WrapperCGF, Loc, F, CallArgs);
WrapperCGF.FinishFunction(); WrapperCGF.FinishFunction();
return WrapperF; return WrapperF;
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// OpenMP Directive Emission // OpenMP Directive Emission
▲ Show 20 Lines • Show All 6,255 Lines • Show Last 20 Lines

clang/test/OpenMP/debug-info-complex-byval.cpp

  • This file was added.
// RUN: %clang_cc1 -fopenmp -x c++ %s -verify -debug-info-kind=limited -triple x86_64-unknown-unknown -emit-llvm -o - | FileCheck %s
// RUN: %clang_cc1 -fopenmp-simd -x c++ %s -verify -debug-info-kind=limited -triple x86_64-unknown-unknown -emit-llvm -o - | FileCheck --check-prefix SIMD-ONLY0 %s
// SIMD-ONLY0-NOT: {{__kmpc|__tgt}}
// expected-no-diagnostics
void a() {
float _Complex b;
// CHECK: call void (%struct.ident_t*, i32, void (i32*, i32*, ...)*, ...) @__kmpc_fork_call(%struct.ident_t* {{.*}}, i32 1, void (i32*, i32*, ...)* bitcast (void (i32*, i32*, i64)* [[OUTLINED:@.+]] to void (i32*, i32*, ...)*), i64 %{{.*}})
#pragma omp parallel firstprivate(b)
;
}
// CHECK: define internal void [[OUTLINED_DEBUG:@.+]](i32* {{.*}}, i32* {{.*}}, <2 x float> {{.*}})
// CHECK: define internal void [[OUTLINED]](i32* {{.*}}, i32* {{.*}}, i64 [[B_VAL:%.+]])
// CHECK: [[B_ADDR:%.+]] = alloca i64,
// CHECK: store i64 [[B_VAL]], i64* [[B_ADDR]],
// CHECK: [[CONV:%.+]] = bitcast i64* [[B_ADDR]] to { float, float }*,
// CHECK: [[BC:%.+]] = bitcast { float, float }* [[CONV]] to <2 x float>*,
// CHECK: [[B_VAL:%.+]] = load <2 x float>, <2 x float>* [[BC]],
// CHECK: call void [[OUTLINED_DEBUG]](i32* %{{.+}}, i32* %{{.+}}, <2 x float> [[B_VAL]])