[clang] Fix static local variables in consteval functions #156933
+122
−6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -std=c++23 %s -emit-llvm -o - | FileCheck %s | ||
|
|
||
| consteval const int* a() { | ||
| static constexpr int b = 3; | ||
| return &b; | ||
| } | ||
|
|
||
| consteval const int returns42() { | ||
| static constexpr long c = 42; | ||
| return c; | ||
| } | ||
|
|
||
| struct S { | ||
| int a; | ||
| constexpr S(int _a) : a(_a){}; | ||
| }; | ||
|
|
||
| consteval auto returns48viastruct() { | ||
| static constexpr S s{ 48 }; | ||
| return &s; | ||
| } | ||
|
|
||
| consteval const int *why() { | ||
| static constexpr int a = 10; | ||
| { | ||
| static constexpr int a = 20; | ||
| return &a; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| consteval const int* returnsarray() { | ||
| static constexpr int a[] = {10, 20, 30}; | ||
| return a; | ||
| } | ||
|
|
||
| consteval const void * self_ref() { | ||
| static constexpr const void* b = &b; | ||
| return b; | ||
| } | ||
|
|
||
| // CHECK: @_ZZ1avE1b = linkonce_odr constant i32 3, comdat, align 4 | ||
| // CHECK: @_ZZ18returns48viastructvE1s = linkonce_odr constant %struct.S { i32 48 }, comdat, align 4 | ||
| // CHECK: @_ZZ3whyvE1a_0 = linkonce_odr constant i32 20, comdat, align 4 | ||
| // CHECK: @_ZZ12returnsarrayvE1a = linkonce_odr constant [3 x i32] [i32 10, i32 20, i32 30], comdat, align 4 | ||
| // CHECK: @_ZZ8self_refvE1b = linkonce_odr constant ptr @_ZZ8self_refvE1b, comdat, align 8 | ||
|
|
||
| // CHECK: define dso_local noundef i32 @_Z1cv() | ||
| // CHECK-NEXT: entry: | ||
| // CHECK-NEXT: %0 = load i32, ptr @_ZZ1avE1b, align 4 | ||
| // CHECK-NEXT: ret i32 %0 | ||
| // CHECK-NEXT: } | ||
| int c() { return *a(); } | ||
|
|
||
| // CHECK: define dso_local noundef i32 @_Z1dv() | ||
| // CHECK-NEXT: entry: | ||
| // CHECK-NEXT: ret i32 42 | ||
| // CHECK-NEXT: } | ||
| int d() { return returns42(); } | ||
|
|
||
| int e() { return returns48viastruct()->a; } | ||
| // CHECK: define dso_local noundef i32 @_Z1ev() | ||
| // CHECK-NEXT: entry: | ||
| // CHECK-NEXT: ret i32 48 | ||
| // CHECK-NEXT: } | ||
|
|
||
| int f() { return *why(); } | ||
| // CHECK: define dso_local noundef i32 @_Z1fv() | ||
| // CHECK-NEXT: entry: | ||
| // CHECK-NEXT: %0 = load i32, ptr @_ZZ3whyvE1a_0, align 4 | ||
| // CHECK-NEXT: ret i32 %0 | ||
| // CHECK-NEXT: } | ||
|
|
||
| int g() { return returnsarray()[2]; } | ||
| // CHECK: define dso_local noundef i32 @_Z1gv() | ||
| // CHECK-NEXT: entry: | ||
| // CHECK-NEXT: %0 = load i32, ptr getelementptr inbounds (i32, ptr @_ZZ12returnsarrayvE1a, i64 2), align 4 | ||
| // CHECK-NEXT: ret i32 %0 | ||
| // CHECK-NEXT: } | ||
|
|
||
| using size_t = decltype(sizeof(void*)); | ||
| int usesself_ref() { | ||
| size_t b = (size_t)self_ref(); | ||
| return (int)b; | ||
| } | ||
| // CHECK: define dso_local noundef i32 @_Z12usesself_refv() | ||
| // CHECK-NEXT: entry: | ||
| // CHECK-NEXT: %b = alloca i64, align 8 | ||
| // CHECK-NEXT: store i64 ptrtoint (ptr @_ZZ8self_refvE1b to i64), ptr %b, align 8 | ||
| // CHECK-NEXT: %0 = load i64, ptr %b, align 8 | ||
| // CHECK-NEXT: %conv = trunc i64 %0 to i32 | ||
| // CHECK-NEXT: ret i32 %conv | ||
| // CHECK-NEXT: } | ||
|
|
||
| // CHECK-NOT: declare noundef ptr @_Z8self_refv() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is
D.isStaticLocal()ever actually false here? I'm worried about this condition potentially getting out of sync with the above, because I think we need to add this as a deferred decl if and only if we did not emit a definition above.Maybe what you should do is have a
bool ShouldDeferDefinitionthat's initially false, but which you set true when you make the decision to emit it without an initializer. Or, actually, do you even need to delay the call toaddDeferredDeclToEmit? Maybe you can just do that above as an alternative to building the null constant.