This revision was automatically updated to reflect the committed changes.
Closed by commit rGf2d5fce86e81: [clang] fixes named return of variables with
dependent alignment (authored by mizvekov).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D105380/new/
https://reviews.llvm.org/D105380
Files:
clang/include/clang/AST/Decl.h
clang/lib/AST/Decl.cpp
clang/lib/Sema/SemaDecl.cpp
clang/lib/Sema/SemaStmt.cpp
clang/test/CXX/class/class.init/class.copy.elision/p3.cpp
clang/test/CodeGen/nrvo-tracking.cpp
Index: clang/test/CodeGen/nrvo-tracking.cpp
===================================================================
--- clang/test/CodeGen/nrvo-tracking.cpp
+++ clang/test/CodeGen/nrvo-tracking.cpp
@@ -1,9 +1,9 @@
// RUN: %clang_cc1 -std=c++20 -fblocks -Wno-return-stack-address -triple x86_64-unknown-unknown-gnu -emit-llvm -O1 -fexperimental-new-pass-manager -o - %s | FileCheck %s
-struct X {
- X();
- X(const X&);
- X(X&&);
+struct alignas(4) X {
+ X();
+ X(const X &);
+ X(X &&);
};
#define L(A, B, C) void l##A() { \
@@ -210,3 +210,75 @@
};
}()();
}
+
+namespace test_alignas {
+
+template <int A> X t1() {
+ X a [[gnu::aligned(A)]];
+ return a;
+}
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t1ILi1EEE1Xv
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: ret void
+template X t1<1>();
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t1ILi4EEE1Xv
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: ret void
+template X t1<4>();
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t1ILi8EEE1Xv
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: call {{.*}} @_ZN1XC1EOS_
+// CHECK-NEXT: call void @llvm.lifetime.end
+template X t1<8>();
+
+template <int A> X t2() {
+ X a [[gnu::aligned(1)]] [[gnu::aligned(A)]] [[gnu::aligned(2)]];
+ return a;
+}
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t2ILi1EEE1Xv
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: ret void
+template X t2<1>();
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t2ILi4EEE1Xv
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: ret void
+template X t2<4>();
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t2ILi8EEE1Xv
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: call {{.*}} @_ZN1XC1EOS_
+// CHECK-NEXT: call void @llvm.lifetime.end
+template X t2<8>();
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t3Ev
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: ret void
+X t3() {
+ X a [[gnu::aligned(1)]];
+ return a;
+}
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t4Ev
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: call {{.*}} @_ZN1XC1EOS_
+// CHECK-NEXT: call void @llvm.lifetime.end
+X t4() {
+ X a [[gnu::aligned(8)]];
+ return a;
+}
+
+// CHECK-LABEL: define{{.*}} void @_ZN12test_alignas2t5Ev
+// CHECK: call {{.*}} @_ZN1XC1Ev
+// CHECK-NEXT: call {{.*}} @_ZN1XC1EOS_
+// CHECK-NEXT: call void @llvm.lifetime.end
+X t5() {
+ X a [[gnu::aligned(1)]] [[gnu::aligned(8)]];
+ return a;
+}
+
+} // namespace test_alignas
Index: clang/test/CXX/class/class.init/class.copy.elision/p3.cpp
===================================================================
--- clang/test/CXX/class/class.init/class.copy.elision/p3.cpp
+++ clang/test/CXX/class/class.init/class.copy.elision/p3.cpp
@@ -487,3 +487,29 @@
}
} // namespace test_simpler_implicit_move
+
+namespace test_auto_variables {
+
+struct S {};
+
+template <class T> struct range {
+ S *begin() const;
+ S *end() const;
+};
+
+template <class T> S test_dependent_ranged_for() {
+ for (auto x : range<T>())
+ return x;
+ return S();
+}
+template S test_dependent_ranged_for<int>();
+
+template <class T> struct X {};
+
+template <class T> X<T> test_dependent_invalid_decl() {
+ auto x = X<T>().foo(); // expected-error {{no member named 'foo'}}
+ return x;
+}
+template X<int> test_dependent_invalid_decl<int>(); // expected-note {{requested here}}
+
+} // namespace test_auto_variables
Index: clang/lib/Sema/SemaStmt.cpp
===================================================================
--- clang/lib/Sema/SemaStmt.cpp
+++ clang/lib/Sema/SemaStmt.cpp
@@ -3395,7 +3395,7 @@
// Variables with higher required alignment than their type's ABI
// alignment cannot use NRVO.
- if (!VDType->isDependentType() && VD->hasAttr<AlignedAttr>() &&
+ if (!VD->hasDependentAlignment() &&
Context.getDeclAlign(VD) > Context.getTypeAlignInChars(VDType))
Info.S = NamedReturnInfo::MoveEligible;
Index: clang/lib/Sema/SemaDecl.cpp
===================================================================
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -13310,16 +13310,6 @@
CheckCompleteDecompositionDeclaration(DD);
}
-/// Determines if a variable's alignment is dependent.
-static bool hasDependentAlignment(VarDecl *VD) {
- if (VD->getType()->isDependentType())
- return true;
- for (auto *I : VD->specific_attrs<AlignedAttr>())
- if (I->isAlignmentDependent())
- return true;
- return false;
-}
-
/// Check if VD needs to be dllexport/dllimport due to being in a
/// dllexport/import function.
void Sema::CheckStaticLocalForDllExport(VarDecl *VD) {
@@ -13408,8 +13398,7 @@
if (unsigned MaxAlign = Context.getTargetInfo().getMaxTLSAlign()) {
// Protect the check so that it's not performed on dependent types and
// dependent alignments (we can't determine the alignment in that case).
- if (VD->getTLSKind() && !hasDependentAlignment(VD) &&
- !VD->isInvalidDecl()) {
+ if (VD->getTLSKind() && !VD->hasDependentAlignment()) {
CharUnits MaxAlignChars = Context.toCharUnitsFromBits(MaxAlign);
if (Context.getDeclAlign(VD) > MaxAlignChars) {
Diag(VD->getLocation(), diag::err_tls_var_aligned_over_maximum)
Index: clang/lib/AST/Decl.cpp
===================================================================
--- clang/lib/AST/Decl.cpp
+++ clang/lib/AST/Decl.cpp
@@ -2534,6 +2534,14 @@
return hasAttr<BlocksAttr>() && !NonParmVarDeclBits.EscapingByref;
}
+bool VarDecl::hasDependentAlignment() const {
+ QualType T = getType();
+ return T->isDependentType() || T->isUndeducedAutoType() ||
+ llvm::any_of(specific_attrs<AlignedAttr>(), [](const AlignedAttr *AA) {
+ return AA->isAlignmentDependent();
+ });
+}
+
VarDecl *VarDecl::getTemplateInstantiationPattern() const {
const VarDecl *VD = this;
Index: clang/include/clang/AST/Decl.h
===================================================================
--- clang/include/clang/AST/Decl.h
+++ clang/include/clang/AST/Decl.h
@@ -1494,6 +1494,9 @@
NonParmVarDeclBits.EscapingByref = true;
}
+ /// Determines if this variable's alignment is dependent.
+ bool hasDependentAlignment() const;
+
/// Retrieve the variable declaration from which this variable could
/// be instantiated, if it is an instantiation (rather than a non-template).
VarDecl *getTemplateInstantiationPattern() const;
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
