From b6aa47d20b5db00e48e96f1879eb5633eac4aa35 Mon Sep 17 00:00:00 2001 From: Alexey Bataev Date: Wed, 29 Aug 2018 20:41:37 +0000 Subject: [PATCH] [OPENMP] Do not create offloading entry for declare target variables declarations. We should not create offloading entries for declare target var declarations as it causes compiler crash. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@340968 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGOpenMPRuntime.cpp | 10 +++++++++- test/OpenMP/declare_target_codegen.cpp | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp index 050f4a616c..6c37c6cf11 100644 --- a/lib/CodeGen/CGOpenMPRuntime.cpp +++ b/lib/CodeGen/CGOpenMPRuntime.cpp @@ -3989,6 +3989,9 @@ void CGOpenMPRuntime::createOffloadEntriesAndInfoMetadata() { CGM.getDiags().Report(DiagID); continue; } + // The vaiable has no definition - no need to add the entry. + if (CE->getVarSize().isZero()) + continue; break; } case OffloadEntriesInfoManagerTy::OMPTargetGlobalVarEntryLink: @@ -8108,7 +8111,12 @@ void CGOpenMPRuntime::registerTargetGlobalVariable(const VarDecl *VD, case OMPDeclareTargetDeclAttr::MT_To: Flags = OffloadEntriesInfoManagerTy::OMPTargetGlobalVarEntryTo; VarName = CGM.getMangledName(VD); - VarSize = CGM.getContext().getTypeSizeInChars(VD->getType()); + if (VD->hasDefinition(CGM.getContext()) != VarDecl::DeclarationOnly) { + VarSize = CGM.getContext().getTypeSizeInChars(VD->getType()); + assert(!VarSize.isZero() && "Expected non-zero size of the variable"); + } else { + VarSize = CharUnits::Zero(); + } Linkage = CGM.getLLVMLinkageVarDefinition(VD, /*IsConstant=*/false); // Temp solution to prevent optimizations of the internal variables. if (CGM.getLangOpts().OpenMPIsDevice && !VD->isExternallyVisible()) { diff --git a/test/OpenMP/declare_target_codegen.cpp b/test/OpenMP/declare_target_codegen.cpp index 0cd611b06f..b8f03f7e20 100644 --- a/test/OpenMP/declare_target_codegen.cpp +++ b/test/OpenMP/declare_target_codegen.cpp @@ -143,4 +143,8 @@ int baz5() { // CHECK-DAG: declare extern_weak signext i32 @__create() // CHECK-NOT: define {{.*}}{{baz1|baz4|maini1}} + +// CHECK-DAG: !{i32 1, !"aaa", i32 0, i32 {{[0-9]+}}} +// CHECK-DAG: !{i32 1, !"ccc", i32 0, i32 {{[0-9]+}}} + #endif // HEADER -- 2.40.0