There is a proposal for this mangling on the cxx-abi-dev list, which we should follow rather than making up our own:<div><br></div><div><a href="http://sourcerytools.com/pipermail/cxx-abi-dev/2012-January/000042.html">http://sourcerytools.com/pipermail/cxx-abi-dev/2012-January/000042.html</a><br>
<br>GCC 4.7 appears to already implement this proposal.<br><br><div class="gmail_quote">On Sat, Feb 25, 2012 at 12:51 PM, Sebastian Redl <span dir="ltr"><<a href="mailto:sebastian.redl@getdesigned.at">sebastian.redl@getdesigned.at</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cornedbee<br>
Date: Sat Feb 25 14:51:07 2012<br>
New Revision: 151455<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=151455&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=151455&view=rev</a><br>
Log:<br>
Better mangling for new-expressions. Also, although we can't mangle arbitrary initializer lists yet (we will need this), turn the crash into a controlled error.<br>
<br>
Modified:<br>
cfe/trunk/lib/AST/ItaniumMangle.cpp<br>
cfe/trunk/test/CodeGenCXX/mangle-exprs.cpp<br>
<br>
Modified: cfe/trunk/lib/AST/ItaniumMangle.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ItaniumMangle.cpp?rev=151455&r1=151454&r2=151455&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ItaniumMangle.cpp?rev=151455&r1=151454&r2=151455&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/AST/ItaniumMangle.cpp (original)<br>
+++ cfe/trunk/lib/AST/ItaniumMangle.cpp Sat Feb 25 14:51:07 2012<br>
@@ -2356,12 +2356,12 @@<br>
case Expr::CXXThisExprClass:<br>
case Expr::DesignatedInitExprClass:<br>
case Expr::ImplicitValueInitExprClass:<br>
- case Expr::InitListExprClass:<br>
case Expr::ParenListExprClass:<br>
case Expr::LambdaExprClass:<br>
llvm_unreachable("unexpected statement kind");<br>
<br>
// FIXME: invent manglings for all these.<br>
+ case Expr::InitListExprClass:<br>
case Expr::BlockExprClass:<br>
case Expr::CXXPseudoDestructorExprClass:<br>
case Expr::ChooseExprClass:<br>
@@ -2454,7 +2454,6 @@<br>
}<br>
<br>
case Expr::CXXNewExprClass: {<br>
- // Proposal from David Vandervoorde, 2010.06.30<br>
const CXXNewExpr *New = cast<CXXNewExpr>(E);<br>
if (New->isGlobalNew()) Out << "gs";<br>
Out << (New->isArray() ? "na" : "nw");<br>
@@ -2464,8 +2463,14 @@<br>
Out << '_';<br>
mangleType(New->getAllocatedType());<br>
if (New->hasInitializer()) {<br>
- // FIXME: Does this mean "parenthesized initializer"?<br>
- Out << "pi";<br>
+ // <initializer> is 'pi <expression>* E' in the current ABI for<br>
+ // parenthesized initializers, but braced initializers are unspecified.<br>
+ // We use 'bl <expression>* E' for "braced list". "bi" is too easy to<br>
+ // confuse.<br>
+ if (New->getInitializationStyle() == CXXNewExpr::ListInit)<br>
+ Out << "bl";<br>
+ else<br>
+ Out << "pi";<br>
const Expr *Init = New->getInitializer();<br>
if (const CXXConstructExpr *CCE = dyn_cast<CXXConstructExpr>(Init)) {<br>
// Directly inline the initializers.<br>
@@ -2476,6 +2481,12 @@<br>
} else if (const ParenListExpr *PLE = dyn_cast<ParenListExpr>(Init)) {<br>
for (unsigned i = 0, e = PLE->getNumExprs(); i != e; ++i)<br>
mangleExpression(PLE->getExpr(i));<br>
+ } else if (New->getInitializationStyle() == CXXNewExpr::ListInit &&<br>
+ isa<InitListExpr>(Init)) {<br>
+ // Only take ParenListExprs apart for list-initialization.<br>
+ const InitListExpr *InitList = cast<InitListExpr>(Init);<br>
+ for (unsigned i = 0, e = InitList->getNumInits(); i != e; ++i)<br>
+ mangleExpression(InitList->getInit(i));<br>
} else<br>
mangleExpression(Init);<br>
}<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/mangle-exprs.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-exprs.cpp?rev=151455&r1=151454&r2=151455&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle-exprs.cpp?rev=151455&r1=151454&r2=151455&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/mangle-exprs.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/mangle-exprs.cpp Sat Feb 25 14:51:07 2012<br>
@@ -1,5 +1,37 @@<br>
// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s<br>
<br>
+namespace std {<br>
+ typedef decltype(sizeof(int)) size_t;<br>
+<br>
+ // libc++'s implementation<br>
+ template <class _E><br>
+ class initializer_list<br>
+ {<br>
+ const _E* __begin_;<br>
+ size_t __size_;<br>
+<br>
+ initializer_list(const _E* __b, size_t __s)<br>
+ : __begin_(__b),<br>
+ __size_(__s)<br>
+ {}<br>
+<br>
+ public:<br>
+ typedef _E value_type;<br>
+ typedef const _E& reference;<br>
+ typedef const _E& const_reference;<br>
+ typedef size_t size_type;<br>
+<br>
+ typedef const _E* iterator;<br>
+ typedef const _E* const_iterator;<br>
+<br>
+ initializer_list() : __begin_(nullptr), __size_(0) {}<br>
+<br>
+ size_t size() const {return __size_;}<br>
+ const _E* begin() const {return __begin_;}<br>
+ const _E* end() const {return __begin_ + __size_;}<br>
+ };<br>
+}<br>
+<br>
template < bool condition, typename T = void ><br>
struct enable_if { typedef T type; };<br>
<br>
@@ -132,3 +164,31 @@<br>
a(x, &X::member, ip);<br>
}<br>
}<br>
+<br>
+namespace test4 {<br>
+ struct X {<br>
+ X(int);<br>
+ X(std::initializer_list<int>);<br>
+ };<br>
+<br>
+ template <typename T><br>
+ void tf1(decltype(new T(1)) p)<br>
+ {}<br>
+<br>
+ template <typename T><br>
+ void tf2(decltype(new T({1})) p)<br>
+ {}<br>
+<br>
+ template <typename T><br>
+ void tf3(decltype(new T{1}) p)<br>
+ {}<br>
+<br>
+ // CHECK: void @_ZN5test43tf1INS_1XEEEvDTnw_T_piLi1EEE<br>
+ template void tf1<X>(X*);<br>
+<br>
+ // FIXME: Need mangling for braced initializers<br>
+ //template void tf2<X>(X*);<br>
+<br>
+ // CHECK: void @_ZN5test43tf3INS_1XEEEvDTnw_T_blLi1EEE<br>
+ template void tf3<X>(X*);<br>
+}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>