From f6f21dcd6c2fa8e44d8c466c5db190aef42beef2 Mon Sep 17 00:00:00 2001 From: Alexey Bataev Date: Wed, 24 Mar 2021 13:21:43 -0700 Subject: [PATCH] [OPENMP]Fix PR49636: Assertion `(!Entry.getAddress() || Entry.getAddress() == Addr) && "Resetting with the new address."' failed. The original issue is caused by the fact that the variable is allocated with incorrect type i1 instead of i8. This causes the bitcasting of the declaration to i8 type and the bitcast expression does not match the original variable. To fix the problem, the UndefValue initializer and the original variable should be emitted with type i8, not i1. Differential Revision: https://reviews.llvm.org/D99297 --- clang/lib/CodeGen/CodeGenModule.cpp | 4 ++-- clang/test/OpenMP/declare_target_codegen.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 3a197e8..f719f00 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -4256,9 +4256,9 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D, D->getType()->isCUDADeviceBuiltinTextureType()); if (getLangOpts().CUDA && (IsCUDASharedVar || IsCUDAShadowVar || IsCUDADeviceShadowVar)) - Init = llvm::UndefValue::get(getTypes().ConvertType(ASTTy)); + Init = llvm::UndefValue::get(getTypes().ConvertTypeForMem(ASTTy)); else if (D->hasAttr()) - Init = llvm::UndefValue::get(getTypes().ConvertType(ASTTy)); + Init = llvm::UndefValue::get(getTypes().ConvertTypeForMem(ASTTy)); else if (!InitExpr) { // This is a tentative definition; tentative definitions are // implicitly initialized with { 0 }. diff --git a/clang/test/OpenMP/declare_target_codegen.cpp b/clang/test/OpenMP/declare_target_codegen.cpp index 1ce211a..4b9bb41b 100644 --- a/clang/test/OpenMP/declare_target_codegen.cpp +++ b/clang/test/OpenMP/declare_target_codegen.cpp @@ -26,6 +26,7 @@ // CHECK-NOT: define {{.*}}{{baz1|baz4|maini1|Base|virtual_}} // CHECK-DAG: Bake // CHECK-NOT: @{{hhh|ggg|fff|eee}} = +// CHECK-DAG: @flag = hidden global i8 undef, // CHECK-DAG: @aaa = external global i32, // CHECK-DAG: @bbb ={{ hidden | }}global i32 0, // CHECK-DAG: weak constant %struct.__tgt_offload_entry { i8* bitcast (i32* @bbb to i8*), @@ -53,8 +54,8 @@ #ifndef HEADER #define HEADER - #pragma omp declare target +bool flag [[clang::loader_uninitialized]]; extern int bbb; #pragma omp end declare target #pragma omp declare target -- 2.7.4