diff options
| author | Eli Friedman <efriedma@codeaurora.org> | 2019-01-22 00:11:17 +0000 |
|---|---|---|
| committer | Eli Friedman <efriedma@codeaurora.org> | 2019-01-22 00:11:17 +0000 |
| commit | 3f82f9e127268d28f2830d72bf4f402e31a0a477 (patch) | |
| tree | 5c63308f94c0e3a25e2f7eaf641d141fc1dc317d /clang/test/CodeGen/const-init.c | |
| parent | 6e69db5a2dfe8cf4658654714c506422e31a19a2 (diff) | |
| download | bcm5719-llvm-3f82f9e127268d28f2830d72bf4f402e31a0a477.tar.gz bcm5719-llvm-3f82f9e127268d28f2830d72bf4f402e31a0a477.zip | |
[CodeGen] Always use string computed in Sema for PredefinedExpr
We can't use any other string, anyway, because its type wouldn't
match the type of the PredefinedExpr.
With this change, we don't compute a "nice" name for the __func__ global
when it's used in the initializer for a constant. This doesn't seem like
a great loss, and I'm not sure how to fix it without either storing more
information in the AST, or somehow threading through the information
from ExprConstant.cpp.
This could break some situations involving BlockDecl; currently,
CodeGenFunction::EmitPredefinedLValue has some logic to intentionally
emit a string different from what Sema computed. This code skips that
logic... but that logic can't work correctly in general anyway. (For
example, sizeof(__func__) returns the wrong result.) Hopefully this
doesn't affect practical code.
Fixes https://bugs.llvm.org/show_bug.cgi?id=40313 .
Differential Revision: https://reviews.llvm.org/D56821
llvm-svn: 351766
Diffstat (limited to 'clang/test/CodeGen/const-init.c')
| -rw-r--r-- | clang/test/CodeGen/const-init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/test/CodeGen/const-init.c b/clang/test/CodeGen/const-init.c index 3fd231b630e..41ac8f2eb05 100644 --- a/clang/test/CodeGen/const-init.c +++ b/clang/test/CodeGen/const-init.c @@ -121,8 +121,8 @@ struct g22 {int x;} __attribute((packed)); struct g23 {char a; short b; char c; struct g22 d;}; struct g23 g24 = {1,2,3,4}; -// CHECK: @g25.g26 = internal global i8* getelementptr inbounds ([4 x i8], [4 x i8]* @__func__.g25, i32 0, i32 0) -// CHECK: @__func__.g25 = private unnamed_addr constant [4 x i8] c"g25\00" +// CHECK: @g25.g26 = internal global i8* getelementptr inbounds ([4 x i8], [4 x i8]* @[[FUNC:.*]], i32 0, i32 0) +// CHECK: @[[FUNC]] = private unnamed_addr constant [4 x i8] c"g25\00" int g25() { static const char *g26 = __func__; return *g26; @@ -153,7 +153,7 @@ void g29() { DCC_PASSWD passwd; } DCC_SRVR_NM; // CHECK: @g29.a = internal global %struct.DCC_SRVR_NM { [2 x i8] c"@\00" }, align 1 - // CHECK: @g29.b = internal global [1 x i32] [i32 ptrtoint ([5 x i8]* @.str to i32)], align 4 + // CHECK: @g29.b = internal global [1 x i32] [i32 ptrtoint ([5 x i8]* @.str.1 to i32)], align 4 // CHECK: @g29.c = internal global [1 x i32] [i32 97], align 4 static DCC_SRVR_NM a = { {"@"} }; static int b[1] = { "asdf" }; // expected-warning {{incompatible pointer to integer conversion initializing 'int' with an expression of type 'char [5]'}} |
