From: Douglas Gregor Date: Tue, 12 Jul 2011 04:47:20 +0000 (+0000) Subject: Implement the Itanium C++ ABI's mangling rule for X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edee94b615059ad178b06a489312eca6e049609a;p=clang Implement the Itanium C++ ABI's mangling rule for non-instantiation-dependent sizeof and alignof expressions. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134963 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/AST/ItaniumMangle.cpp b/lib/AST/ItaniumMangle.cpp index 7f1ea3aaca..958b4a26a0 100644 --- a/lib/AST/ItaniumMangle.cpp +++ b/lib/AST/ItaniumMangle.cpp @@ -2169,6 +2169,9 @@ void CXXNameMangler::mangleExpression(const Expr *E, unsigned Arity) { // ::= L E # integer literal // ::= L E # floating literal // ::= L E # external name + QualType ImplicitlyConvertedToType; + +recurse: switch (E->getStmtClass()) { case Expr::NoStmtClass: #define ABSTRACT_STMT(Type) @@ -2363,6 +2366,23 @@ void CXXNameMangler::mangleExpression(const Expr *E, unsigned Arity) { case Expr::UnaryExprOrTypeTraitExprClass: { const UnaryExprOrTypeTraitExpr *SAE = cast(E); + + if (!SAE->isInstantiationDependent()) { + // Itanium C++ ABI: + // If the operand of a sizeof or alignof operator is not + // instantiation-dependent it is encoded as an integer literal + // reflecting the result of the operator. + // + // If the result of the operator is implicitly converted to a known + // integer type, that type is used for the literal; otherwise, the type + // of std::size_t or std::ptrdiff_t is used. + QualType T = (ImplicitlyConvertedToType.isNull() || + !ImplicitlyConvertedToType->isIntegerType())? SAE->getType() + : ImplicitlyConvertedToType; + mangleIntegerLiteral(T, SAE->EvaluateAsInt(Context.getASTContext())); + break; + } + switch(SAE->getKind()) { case UETT_SizeOf: Out << 's'; @@ -2466,8 +2486,9 @@ void CXXNameMangler::mangleExpression(const Expr *E, unsigned Arity) { } case Expr::ImplicitCastExprClass: { - mangleExpression(cast(E)->getSubExpr(), Arity); - break; + ImplicitlyConvertedToType = E->getType(); + E = cast(E)->getSubExpr(); + goto recurse; } case Expr::ObjCBridgedCastExprClass: { diff --git a/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp index 8f1c682bb0..56e70a2b15 100644 --- a/test/CodeGenCXX/mangle.cpp +++ b/test/CodeGenCXX/mangle.cpp @@ -804,9 +804,25 @@ namespace test33 { } namespace test34 { + // Mangling for instantiation-dependent decltype expressions. template void f(decltype(sizeof(decltype(T() + T())))) {} // CHECK: define weak_odr void @_ZN6test341fIiEEvDTstDTplcvT__EcvS1__EEE template void f(decltype(sizeof(1))); + + // Mangling for non-instantiation-dependent sizeof expressions. + template + void f2(int (&)[N + sizeof(int*)]) {} + + // CHECK: define weak_odr void @_ZN6test342f2ILj4EEEvRAplT_Lm8E_i + template void f2<4>(int (&)[4 + sizeof(int*)]); + + // Mangling for non-instantiation-dependent sizeof expressions + // involving an implicit conversion of the result of the sizeof. + template + void f3(int (&)[N + sizeof(int*)]) {} + + // CHECK: define weak_odr void @_ZN6test342f3ILy4EEEvRAplT_Ly8E_i + template void f3<4>(int (&)[4 + sizeof(int*)]); }