Revert r128691, "IRgen: Improve GCC compatibility when dealing with packed

arrays by propagating", it's breaking test in ways I don't understand yet.

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

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index cd68f8fdaf6c450e01245a84391eff64c5fba3b1..ab88a38babf2d6512e0a787d949a00f0ab3d89e9 100644 (file)
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1424,7 +1424,6 @@ LValue CodeGenFunction::EmitArraySubscriptExpr(const ArraySubscriptExpr *E) {
   // We know that the pointer points to a type of the correct size, unless the
   // size is a VLA or Objective-C interface.
   llvm::Value *Address = 0;
-  unsigned ArrayAlignment = 0;
   if (const VariableArrayType *VAT =
         getContext().getAsVariableArrayType(E->getType())) {
     llvm::Value *VLASize = GetVLASize(VAT);
@@ -1460,14 +1459,10 @@ LValue CodeGenFunction::EmitArraySubscriptExpr(const ArraySubscriptExpr *E) {
     // "gep x, i" here.  Emit one "gep A, 0, i".
     assert(Array->getType()->isArrayType() &&
            "Array to pointer decay must have array source type!");
-    LValue ArrayLV = EmitLValue(Array);
-    llvm::Value *ArrayPtr = ArrayLV.getAddress();
+    llvm::Value *ArrayPtr = EmitLValue(Array).getAddress();
     llvm::Value *Zero = llvm::ConstantInt::get(Int32Ty, 0);
     llvm::Value *Args[] = { Zero, Idx };
     
-    // Propagate the alignment from the array itself to the result.
-    ArrayAlignment = ArrayLV.getAlignment();
-
     if (getContext().getLangOptions().isSignedOverflowDefined())
       Address = Builder.CreateGEP(ArrayPtr, Args, Args+2, "arrayidx");
     else
@@ -1485,7 +1480,7 @@ LValue CodeGenFunction::EmitArraySubscriptExpr(const ArraySubscriptExpr *E) {
   assert(!T.isNull() &&
          "CodeGenFunction::EmitArraySubscriptExpr(): Illegal base type");
 
-  LValue LV = MakeAddrLValue(Address, T, ArrayAlignment);
+  LValue LV = MakeAddrLValue(Address, T);
   LV.getQuals().setAddressSpace(E->getBase()->getType().getAddressSpace());
 
   if (getContext().getLangOptions().ObjC1 &&

diff --git a/test/CodeGen/packed-arrays.c b/test/CodeGen/packed-arrays.c
deleted file mode 100644 (file)
index 479851f..0000000
--- a/test/CodeGen/packed-arrays.c
+++ /dev/null
@@ -1,147 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-unk-unk -emit-llvm -Os -o %t %s
-// RUN: FileCheck < %t %s
-
-struct s0 {
-  unsigned int x[2] __attribute__((packed));
-};
-
-struct s1 {
-  unsigned int x[2] __attribute__((packed));
-  unsigned int y;
-  unsigned int z __attribute__((packed));
-};
-
-struct s2 {
-  unsigned int x[2] __attribute__((packed));
-  unsigned int y __attribute__((packed));
-  unsigned int z __attribute__((packed));
-};
-
-struct __attribute__((packed)) s3 {
-  unsigned int x[2];
-  unsigned int y;
-  unsigned int z;
-};
-
-// CHECK: @align0 = global i32 1
-int align0 = __alignof(struct s0);
-// CHECK: @align1 = global i32 4
-int align1 = __alignof(struct s1);
-// CHECK: @align2 = global i32 1
-int align2 = __alignof(struct s2);
-// CHECK: @align3 = global i32 1
-int align3 = __alignof(struct s3);
-
-// CHECK: @align0_x = global i32 1
-int align0_x = __alignof(((struct s0*) 0)->x);
-// We are currently incompatible with GCC here. <rdar://problem/9217290>
-//
-// CHECK-XFAIL: @align1_x = global i32 1
-// CHECK: @align1_x = global i32 4
-int align1_x = __alignof(((struct s1*) 0)->x);
-// CHECK: @align2_x = global i32 1
-int align2_x = __alignof(((struct s2*) 0)->x);
-// CHECK: @align3_x = global i32 1
-int align3_x = __alignof(((struct s3*) 0)->x);
-
-// CHECK: @align0_x0 = global i32 4
-int align0_x0 = __alignof(((struct s0*) 0)->x[0]);
-// CHECK: @align1_x0 = global i32 4
-int align1_x0 = __alignof(((struct s1*) 0)->x[0]);
-// CHECK: @align2_x0 = global i32 4
-int align2_x0 = __alignof(((struct s2*) 0)->x[0]);
-// CHECK: @align3_x0 = global i32 4
-int align3_x0 = __alignof(((struct s3*) 0)->x[0]);
-
-// CHECK: define i32 @f0_a
-// CHECK:   load i32* %{{.*}}, align 1
-// CHECK: }
-// CHECK: define i32 @f0_b
-// CHECK:   load i32* %{{.*}}, align 4
-// CHECK: }
-int f0_a(struct s0 *a) {
-  return a->x[1];
-}
-int f0_b(struct s0 *a) {
-  return *(a->x + 1);
-}
-
-// CHECK: define i32 @f1_a
-// CHECK:   load i32* %{{.*}}, align 4
-// CHECK: }
-// CHECK: define i32 @f1_b
-// CHECK:   load i32* %{{.*}}, align 4
-// CHECK: }
-
-// Note that we are incompatible with GCC on these two examples.
-//
-// CHECK: define i32 @f1_c
-// CHECK-XFAIL:   load i32* %{{.*}}, align 1
-// CHECK:   load i32* %{{.*}}, align 4
-// CHECK: }
-// CHECK: define i32 @f1_d
-// CHECK-XFAIL:   load i32* %{{.*}}, align 1
-// CHECK:   load i32* %{{.*}}, align 4
-// CHECK: }
-int f1_a(struct s1 *a) {
-  return a->x[1];
-}
-int f1_b(struct s1 *a) {
-  return *(a->x + 1);
-}
-int f1_c(struct s1 *a) {
-  return a->y;
-}
-int f1_d(struct s1 *a) {
-  return a->z;
-}
-
-// CHECK: define i32 @f2_a
-// CHECK:   load i32* %{{.*}}, align 1
-// CHECK: }
-// CHECK: define i32 @f2_b
-// CHECK:   load i32* %{{.*}}, align 4
-// CHECK: }
-// CHECK: define i32 @f2_c
-// CHECK:   load i32* %{{.*}}, align 1
-// CHECK: }
-// CHECK: define i32 @f2_d
-// CHECK:   load i32* %{{.*}}, align 1
-// CHECK: }
-int f2_a(struct s2 *a) {
-  return a->x[1];
-}
-int f2_b(struct s2 *a) {
-  return *(a->x + 1);
-}
-int f2_c(struct s2 *a) {
-  return a->y;
-}
-int f2_d(struct s2 *a) {
-  return a->z;
-}
-
-// CHECK: define i32 @f3_a
-// CHECK:   load i32* %{{.*}}, align 1
-// CHECK: }
-// CHECK: define i32 @f3_b
-// CHECK:   load i32* %{{.*}}, align 4
-// CHECK: }
-// CHECK: define i32 @f3_c
-// CHECK:   load i32* %{{.*}}, align 1
-// CHECK: }
-// CHECK: define i32 @f3_d
-// CHECK:   load i32* %{{.*}}, align 1
-// CHECK: }
-int f3_a(struct s3 *a) {
-  return a->x[1];
-}
-int f3_b(struct s3 *a) {
-  return *(a->x + 1);
-}
-int f3_c(struct s3 *a) {
-  return a->y;
-}
-int f3_d(struct s3 *a) {
-  return a->z;
-}