Re: r310704 - Revert r302670 for the upcoming 5.0.0 release

[Hans Wennborg via cfe-commits]

Merged to 5.0 in r310728.

On Fri, Aug 11, 2017 at 4:39 AM, Stefan Maksimovic via cfe-commits
 wrote:
> Author: smaksimovic
> Date: Fri Aug 11 04:39:07 2017
> New Revision: 310704
>
> URL: http://llvm.org/viewvc/llvm-project?rev=310704=rev
> Log:
> Revert r302670 for the upcoming 5.0.0 release
>
> This is causing failures when compiling clang with -O3
> as one of the structures used by clang is passed by
> value and uses the fastcc calling convention.
>
> Faliures manifest for stage2 mips build.
>
> Removed:
> cfe/trunk/test/CodeGen/mips-aggregate-arg.c
> Modified:
> cfe/trunk/lib/CodeGen/TargetInfo.cpp
>
> Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
> URL: 
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=310704=310703=310704=diff
> ==
> --- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
> +++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Fri Aug 11 04:39:07 2017
> @@ -6821,14 +6821,6 @@ MipsABIInfo::classifyArgumentType(QualTy
>return getNaturalAlignIndirect(Ty, RAA == 
> CGCXXABI::RAA_DirectInMemory);
>  }
>
> -// Use indirect if the aggregate cannot fit into registers for
> -// passing arguments according to the ABI
> -unsigned Threshold = IsO32 ? 16 : 64;
> -
> -if(getContext().getTypeSizeInChars(Ty) > 
> CharUnits::fromQuantity(Threshold))
> -  return ABIArgInfo::getIndirect(CharUnits::fromQuantity(Align), true,
> - getContext().getTypeAlign(Ty) / 8 > 
> Align);
> -
>  // If we have reached here, aggregates are passed directly by coercing to
>  // another structure type. Padding is inserted if the offset of the
>  // aggregate is unaligned.
>
> Removed: cfe/trunk/test/CodeGen/mips-aggregate-arg.c
> URL: 
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/mips-aggregate-arg.c?rev=310703=auto
> ==
> --- cfe/trunk/test/CodeGen/mips-aggregate-arg.c (original)
> +++ cfe/trunk/test/CodeGen/mips-aggregate-arg.c (removed)
> @@ -1,38 +0,0 @@
> -// RUN: %clang_cc1 -triple mipsel-unknown-linux-gnu -S -emit-llvm -o - %s | 
> FileCheck -check-prefix=O32 %s
> -// RUN: %clang_cc1 -triple mips64el-unknown-linux-gnu -S -emit-llvm -o - %s  
> -target-abi n32 | FileCheck -check-prefix=N32-N64 %s
> -// RUN: %clang_cc1 -triple mips64el-unknown-linux-gnu -S -emit-llvm -o - %s  
> -target-abi n64 | FileCheck -check-prefix=N32-N64 %s
> -
> -struct t1 {
> -  char t1[10];
> -};
> -
> -struct t2 {
> -  char t2[20];
> -};
> -
> -struct t3 {
> -  char t3[65];
> -};
> -
> -extern struct t1 g1;
> -extern struct t2 g2;
> -extern struct t3 g3;
> -extern void f1(struct t1);
> -extern void f2(struct t2);
> -extern void f3(struct t3);
> -
> -void f() {
> -
> -// O32:  call void @f1(i32 inreg %{{[0-9]+}}, i32 inreg %{{[0-9]+}}, i16 
> inreg %{{[0-9]+}})
> -// O32:  call void @f2(%struct.t2* byval align 4 %{{.*}})
> -// O32:  call void @f3(%struct.t3* byval align 4 %{{.*}})
> -
> -// N32-N64:  call void @f1(i64 inreg %{{[0-9]+}}, i16 inreg %{{[0-9]+}})
> -// N32-N64:  call void @f2(i64 inreg %{{[0-9]+}}, i64 inreg %{{[0-9]+}}, i32 
> inreg %{{[0-9]+}})
> -// N32-N64:  call void @f3(%struct.t3* byval align 8 %{{.*}})
> -
> -  f1(g1);
> -  f2(g2);
> -  f3(g3);
> -}
> -
>
>
> ___
> cfe-commits mailing list
> cfe-commits@lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

r310704 - Revert r302670 for the upcoming 5.0.0 release

[Stefan Maksimovic via cfe-commits]

Author: smaksimovic
Date: Fri Aug 11 04:39:07 2017
New Revision: 310704

URL: http://llvm.org/viewvc/llvm-project?rev=310704=rev
Log:
Revert r302670 for the upcoming 5.0.0 release

This is causing failures when compiling clang with -O3
as one of the structures used by clang is passed by
value and uses the fastcc calling convention.

Faliures manifest for stage2 mips build.

Removed:
cfe/trunk/test/CodeGen/mips-aggregate-arg.c
Modified:
cfe/trunk/lib/CodeGen/TargetInfo.cpp

Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=310704=310703=310704=diff
==
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Fri Aug 11 04:39:07 2017
@@ -6821,14 +6821,6 @@ MipsABIInfo::classifyArgumentType(QualTy
   return getNaturalAlignIndirect(Ty, RAA == CGCXXABI::RAA_DirectInMemory);
 }
 
-// Use indirect if the aggregate cannot fit into registers for
-// passing arguments according to the ABI
-unsigned Threshold = IsO32 ? 16 : 64;
-
-if(getContext().getTypeSizeInChars(Ty) > 
CharUnits::fromQuantity(Threshold))
-  return ABIArgInfo::getIndirect(CharUnits::fromQuantity(Align), true,
- getContext().getTypeAlign(Ty) / 8 > 
Align);
-
 // If we have reached here, aggregates are passed directly by coercing to
 // another structure type. Padding is inserted if the offset of the
 // aggregate is unaligned.

Removed: cfe/trunk/test/CodeGen/mips-aggregate-arg.c
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/mips-aggregate-arg.c?rev=310703=auto
==
--- cfe/trunk/test/CodeGen/mips-aggregate-arg.c (original)
+++ cfe/trunk/test/CodeGen/mips-aggregate-arg.c (removed)
@@ -1,38 +0,0 @@
-// RUN: %clang_cc1 -triple mipsel-unknown-linux-gnu -S -emit-llvm -o - %s | 
FileCheck -check-prefix=O32 %s
-// RUN: %clang_cc1 -triple mips64el-unknown-linux-gnu -S -emit-llvm -o - %s  
-target-abi n32 | FileCheck -check-prefix=N32-N64 %s
-// RUN: %clang_cc1 -triple mips64el-unknown-linux-gnu -S -emit-llvm -o - %s  
-target-abi n64 | FileCheck -check-prefix=N32-N64 %s
-
-struct t1 {
-  char t1[10];
-};
-
-struct t2 {
-  char t2[20];
-};
-
-struct t3 {
-  char t3[65];
-};
-
-extern struct t1 g1;
-extern struct t2 g2;
-extern struct t3 g3;
-extern void f1(struct t1);
-extern void f2(struct t2);
-extern void f3(struct t3);
-
-void f() {
-
-// O32:  call void @f1(i32 inreg %{{[0-9]+}}, i32 inreg %{{[0-9]+}}, i16 inreg 
%{{[0-9]+}})
-// O32:  call void @f2(%struct.t2* byval align 4 %{{.*}})
-// O32:  call void @f3(%struct.t3* byval align 4 %{{.*}})
-
-// N32-N64:  call void @f1(i64 inreg %{{[0-9]+}}, i16 inreg %{{[0-9]+}})
-// N32-N64:  call void @f2(i64 inreg %{{[0-9]+}}, i64 inreg %{{[0-9]+}}, i32 
inreg %{{[0-9]+}})
-// N32-N64:  call void @f3(%struct.t3* byval align 8 %{{.*}})
-
-  f1(g1);
-  f2(g2);
-  f3(g3);
-}
-


___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits