Skip to content

Commit bfd41c3

Browse files
committed
[LinkerWrapper][Obvious] Fix missing use of texture data type
Summary: This was accidentally linked to the wrong pointer, causing unused variable warnings and registering the wrong thing.
1 parent c6805ea commit bfd41c3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

clang/test/Driver/linker-wrapper-image.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
// CUDA-NEXT: %4 = getelementptr inbounds %struct.__tgt_offload_entry, ptr %entry1, i64 0, i32 3
9191
// CUDA-NEXT: %flags = load i32, ptr %4, align 4
9292
// CUDA-NEXT: %5 = getelementptr inbounds %struct.__tgt_offload_entry, ptr %entry1, i64 0, i32 4
93-
// CUDA-NEXT: %textype = load i32, ptr %4, align 4
93+
// CUDA-NEXT: %textype = load i32, ptr %5, align 4
9494
// CUDA-NEXT: %type = and i32 %flags, 7
9595
// CUDA-NEXT: %6 = and i32 %flags, 8
9696
// CUDA-NEXT: %extern = lshr i32 %6, 3
@@ -189,7 +189,7 @@
189189
// HIP-NEXT: %4 = getelementptr inbounds %struct.__tgt_offload_entry, ptr %entry1, i64 0, i32 3
190190
// HIP-NEXT: %flags = load i32, ptr %4, align 4
191191
// HIP-NEXT: %5 = getelementptr inbounds %struct.__tgt_offload_entry, ptr %entry1, i64 0, i32 4
192-
// HIP-NEXT: %textype = load i32, ptr %4, align 4
192+
// HIP-NEXT: %textype = load i32, ptr %5, align 4
193193
// HIP-NEXT: %type = and i32 %flags, 7
194194
// HIP-NEXT: %6 = and i32 %flags, 8
195195
// HIP-NEXT: %extern = lshr i32 %6, 3

clang/tools/clang-linker-wrapper/OffloadWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ Function *createRegisterGlobalsFunction(Module &M, bool IsHIP) {
385385
Builder.CreateInBoundsGEP(offloading::getEntryTy(M), Entry,
386386
{ConstantInt::get(getSizeTTy(M), 0),
387387
ConstantInt::get(Type::getInt32Ty(C), 4)});
388-
auto *Data = Builder.CreateLoad(Type::getInt32Ty(C), FlagsPtr, "textype");
388+
auto *Data = Builder.CreateLoad(Type::getInt32Ty(C), DataPtr, "textype");
389389
auto *Kind = Builder.CreateAnd(
390390
Flags, ConstantInt::get(Type::getInt32Ty(C), 0x7), "type");
391391

0 commit comments

Comments
 (0)