maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CodeGen] Call ConvertTypeForMem instead of ConvertType 

This fixes a crash that occurs when the type passed to the method is
`_Bool`.

rdar://74493389
This commit is contained in:
Akira Hatanaka 2021-02-25 12:11:18 -08:00
parent fdce098b49
commit ec4408ad69
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/CodeGen/CGNonTrivialStruct.cpp
View File

@ -568,7 +568,7 @@ struct GenBinaryFunc : CopyStructVisitor<Derived, IsMove>,
this->CGF->Builder.CreateBitCast(SrcAddr, PtrTy), FT);
SrcLV = this->CGF->EmitLValueForField(SrcBase, FD);
} else {
llvm::PointerType *Ty = this->CGF->ConvertType(FT)->getPointerTo();
llvm::PointerType *Ty = this->CGF->ConvertTypeForMem(FT)->getPointerTo();
Address DstAddr = this->CGF->Builder.CreateBitCast(Addrs[DstIdx], Ty);
Address SrcAddr = this->CGF->Builder.CreateBitCast(Addrs[SrcIdx], Ty);
DstLV = this->CGF->MakeAddrLValue(DstAddr, FT);

23
clang/test/CodeGenObjC/strong-in-c-struct.m
View File

@ -79,6 +79,11 @@ typedef struct {
volatile int a[16];
} VolatileArray ;
typedef struct {
_Bool f0[2];
VolatileArray f1;
} StructWithBool;
#endif
#ifdef USESTRUCT
@ -539,6 +544,24 @@ void test_copy_assignment_StrongBlock(StrongBlock *d, StrongBlock *s) {
*d = *s;
}
// CHECK-LABEL: define{{.*}} void @test_copy_assignment_StructWithBool(
// CHECK: call void @__copy_assignment_8_8_AB0s1n2_tv0w8_AE_S_sv8_AB16s4n16_tv128w32_AE(
// CHECK-LABEL: define linkonce_odr hidden void @__copy_assignment_8_8_AB0s1n2_tv0w8_AE_S_sv8_AB16s4n16_tv128w32_AE(
// CHECK: %[[ADDR_CUR:.*]] = phi i8**
// CHECK: %[[ADDR_CUR1:.*]] = phi i8**
// CHECK: %[[V4:.*]] = bitcast i8** %[[ADDR_CUR]] to i8*
// CHECK: %[[V5:.*]] = bitcast i8** %[[ADDR_CUR1]] to i8*
// CHECK: %[[V6:.*]] = load volatile i8, i8* %[[V5]], align 1
// CHECK: %[[TOBOOL:.*]] = trunc i8 %[[V6]] to i1
// CHECK: %[[FROMBOOL:.*]] = zext i1 %[[TOBOOL]] to i8
// CHECK: store volatile i8 %[[FROMBOOL]], i8* %[[V4]], align 1
void test_copy_assignment_StructWithBool(StructWithBool *d, StructWithBool *s) {
*d = *s;
}
// CHECK: define{{.*}} void @test_copy_constructor_StrongVolatile0(
// CHECK: call void @__copy_constructor_8_8_t0w4_sv8(
// CHECK-NOT: call