[CodeGen] Fix a crash that occurs when a non-trivial C struct with a

volatile array field is copied.

The crash occurs because method 'visitArray' passes a null FieldDecl to
method 'visit' and some of the methods called downstream expect a
non-null FieldDecl to be passed.

This reapplies r330151 with a fix to the test case.

rdar://problem/33599681

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@330155 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGNonTrivialStruct.cpp b/lib/CodeGen/CGNonTrivialStruct.cpp
index 731938af8677960e12e0fb221820cf7341b0bd8d..4f1708497b61b3d9520cdc37594f817b53810631 100644 (file)
--- a/lib/CodeGen/CGNonTrivialStruct.cpp
+++ b/lib/CodeGen/CGNonTrivialStruct.cpp
@@ -21,10 +21,11 @@ using namespace clang;
 using namespace CodeGen;
 
 // Return the size of a field in number of bits.
-static uint64_t getFieldSize(const FieldDecl *FD, ASTContext &Ctx) {
-  if (FD->isBitField())
+static uint64_t getFieldSize(const FieldDecl *FD, QualType FT,
+                             ASTContext &Ctx) {
+  if (FD && FD->isBitField())
     return FD->getBitWidthValue(Ctx);
-  return Ctx.getTypeSize(FD->getType());
+  return Ctx.getTypeSize(FT);
 }
 
 namespace {
@@ -187,7 +188,7 @@ struct CopyStructVisitor : StructVisitor<Derived>,
                     Ts... Args) {
     assert(!FT.isVolatileQualified() && "volatile field not expected");
     ASTContext &Ctx = asDerived().getContext();
-    uint64_t FieldSize = getFieldSize(FD, Ctx);
+    uint64_t FieldSize = getFieldSize(FD, FT, Ctx);
 
     // Ignore zero-sized fields.
     if (FieldSize == 0)
@@ -336,7 +337,7 @@ struct GenBinaryFuncName : CopyStructVisitor<GenBinaryFuncName<IsMove>, IsMove>,
     uint64_t OffsetInBits =
         this->Ctx.toBits(CurStackOffset) + this->getFieldOffsetInBits(FD);
     this->appendStr("_tv" + llvm::to_string(OffsetInBits) + "w" +
-                    llvm::to_string(getFieldSize(FD, this->Ctx)));
+                    llvm::to_string(getFieldSize(FD, FT, this->Ctx)));
   }
 };
 
@@ -595,16 +596,25 @@ struct GenBinaryFunc : CopyStructVisitor<Derived, IsMove>,
   template <class... Ts>
   void visitVolatileTrivial(QualType FT, const FieldDecl *FD, CharUnits Offset,
                             std::array<Address, 2> Addrs) {
-    QualType RT = QualType(FD->getParent()->getTypeForDecl(), 0);
-    llvm::PointerType *PtrTy = this->CGF->ConvertType(RT)->getPointerTo();
-    Address DstAddr = this->getAddrWithOffset(Addrs[DstIdx], Offset);
-    LValue DstBase = this->CGF->MakeAddrLValue(
-        this->CGF->Builder.CreateBitCast(DstAddr, PtrTy), FT);
-    LValue DstLV = this->CGF->EmitLValueForField(DstBase, FD);
-    Address SrcAddr = this->getAddrWithOffset(Addrs[SrcIdx], Offset);
-    LValue SrcBase = this->CGF->MakeAddrLValue(
-        this->CGF->Builder.CreateBitCast(SrcAddr, PtrTy), FT);
-    LValue SrcLV = this->CGF->EmitLValueForField(SrcBase, FD);
+    LValue DstLV, SrcLV;
+    if (FD) {
+      QualType RT = QualType(FD->getParent()->getTypeForDecl(), 0);
+      llvm::PointerType *PtrTy = this->CGF->ConvertType(RT)->getPointerTo();
+      Address DstAddr = this->getAddrWithOffset(Addrs[DstIdx], Offset);
+      LValue DstBase = this->CGF->MakeAddrLValue(
+          this->CGF->Builder.CreateBitCast(DstAddr, PtrTy), FT);
+      DstLV = this->CGF->EmitLValueForField(DstBase, FD);
+      Address SrcAddr = this->getAddrWithOffset(Addrs[SrcIdx], Offset);
+      LValue SrcBase = this->CGF->MakeAddrLValue(
+          this->CGF->Builder.CreateBitCast(SrcAddr, PtrTy), FT);
+      SrcLV = this->CGF->EmitLValueForField(SrcBase, FD);
+    } else {
+      llvm::PointerType *Ty = this->CGF->ConvertType(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);
+      SrcLV = this->CGF->MakeAddrLValue(SrcAddr, FT);
+    }
     RValue SrcVal = this->CGF->EmitLoadOfLValue(SrcLV, SourceLocation());
     this->CGF->EmitStoreThroughLValue(SrcVal, DstLV);
   }

diff --git a/test/CodeGenObjC/strong-in-c-struct.m b/test/CodeGenObjC/strong-in-c-struct.m
index 6310943d2efcb348b876133e5e27e762a226cab6..36e9049635f23d0db94d64c9fa2b6e94a4953e13 100644 (file)
--- a/test/CodeGenObjC/strong-in-c-struct.m
+++ b/test/CodeGenObjC/strong-in-c-struct.m
@@ -70,6 +70,11 @@ typedef struct {
   volatile char i6;
 } Bitfield1;
 
+typedef struct {
+  id x;
+  volatile int a[16];
+} VolatileArray ;
+
 #endif
 
 #ifdef USESTRUCT
@@ -540,4 +545,19 @@ void test_strong_in_union() {
   U t;
 }
 
+// CHECK: define void @test_copy_constructor_VolatileArray(
+// CHECK: call void @__copy_constructor_8_8_s0_AB8s4n16_tv64w32_AE(
+
+// CHECK: define linkonce_odr hidden void @__copy_constructor_8_8_s0_AB8s4n16_tv64w32_AE(
+// CHECK: %[[ADDR_CUR:.*]] = phi i8**
+// CHECK: %[[ADDR_CUR1:.*]] = phi i8**
+// CHECK: %[[V12:.*]] = bitcast i8** %[[ADDR_CUR]] to i32*
+// CHECK: %[[V13:.*]] = bitcast i8** %[[ADDR_CUR1]] to i32*
+// CHECK: %[[V14:.*]] = load volatile i32, i32* %[[V13]], align 4
+// CHECK: store volatile i32 %[[V14]], i32* %[[V12]], align 4
+
+void test_copy_constructor_VolatileArray(VolatileArray *a) {
+  VolatileArray t = *a;
+}
+
 #endif /* USESTRUCT */