Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CIR] incorrect global view index and offset when neg index #795

Merged
merged 5 commits into from
Aug 22, 2024
+36 −9
Merged

[CIR] incorrect global view index and offset when neg index #795

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6072168
[CIR] incorrect global view index and offset when neg index
HerrCai0907 Aug 18, 2024
c85d054
fix review
HerrCai0907 Aug 18, 2024
0ce7d04
remove PointerType
HerrCai0907 Aug 18, 2024
60d1dfa
add llvm test
HerrCai0907 Aug 21, 2024
ffbacd3
combine c and cpp test
HerrCai0907 Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions clang/lib/CIR/CodeGen/CIRGenBuilder.h
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,7 @@
#include <cassert>
#include <optional>
#include <string>
#include <utility>

namespace cir {

@@ -854,24 +855,30 @@ class CIRGenBuilderTy : public CIRBaseBuilderTy {

mlir::Type SubType;

auto getIndexAndNewOffset =
[](int64_t Offset, int64_t EltSize) -> std::pair<int64_t, int64_t> {
int64_t DivRet = Offset / EltSize;
if (DivRet < 0)
DivRet -= 1; // make sure offset is positive
int64_t ModRet = Offset - (DivRet * EltSize);
return {DivRet, ModRet};
};

if (auto ArrayTy = mlir::dyn_cast<mlir::cir::ArrayType>(Ty)) {
auto EltSize = Layout.getTypeAllocSize(ArrayTy.getEltType());
Indices.push_back(Offset / EltSize);
int64_t EltSize = Layout.getTypeAllocSize(ArrayTy.getEltType());
SubType = ArrayTy.getEltType();
Offset %= EltSize;
} else if (auto PtrTy = mlir::dyn_cast<mlir::cir::PointerType>(Ty)) {
auto EltSize = Layout.getTypeAllocSize(PtrTy.getPointee());
Indices.push_back(Offset / EltSize);
SubType = PtrTy.getPointee();
Offset %= EltSize;
auto const [Index, NewOffset] = getIndexAndNewOffset(Offset, EltSize);
Indices.push_back(Index);
Offset = NewOffset;
} else if (auto StructTy = mlir::dyn_cast<mlir::cir::StructType>(Ty)) {
auto Elts = StructTy.getMembers();
unsigned Pos = 0;
for (size_t I = 0; I < Elts.size(); ++I) {
auto EltSize = Layout.getTypeAllocSize(Elts[I]);
unsigned AlignMask = Layout.getABITypeAlign(Elts[I]).value() - 1;
Pos = (Pos + AlignMask) & ~AlignMask;
if (Offset < Pos + EltSize) {
assert(Offset >= 0);
if (static_cast<uint64_t>(Offset) < Pos + EltSize) {
Indices.push_back(I);
SubType = Elts[I];
Offset -= Pos;
20 changes: 20 additions & 0 deletions clang/test/CIR/CodeGen/globals-neg-index-array.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-cir %s -o %t.cir
// RUN: FileCheck --input-file=%t.cir %s
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -emit-llvm %s -o %t.ll
// RUN: FileCheck --check-prefix=LLVM --input-file=%t.ll %s
// RUN: %clang_cc1 -x c++ -triple x86_64-unknown-linux-gnu -emit-cir %s -o %t.cir
// RUN: FileCheck --input-file=%t.cir %s
// RUN: %clang_cc1 -x c++ -triple x86_64-unknown-linux-gnu -fclangir -emit-llvm %s -o %t.ll
// RUN: FileCheck --check-prefix=LLVM --input-file=%t.ll %s

struct __attribute__((packed)) PackedStruct {
char a1;
char a2;
char a3;
};
struct PackedStruct packed[10];
char *packed_element = &(packed[-2].a3);
// CHECK: cir.global external @packed = #cir.zero : !cir.array<!ty_22PackedStruct22 x 10> loc(#loc5)
// CHECK: cir.global external @packed_element = #cir.global_view<@packed, [-2 : i32, 2 : i32]>
// LLVM: @packed = global [10 x %struct.PackedStruct] zeroinitializer
// LLVM: @packed_element = global ptr getelementptr inbounds ([10 x %struct.PackedStruct], ptr @packed, i32 -2, i32 2)