[cfe-commits] r118019 - in /cfe/trunk: lib/CodeGen/Mangle.cpp test/CodeGenCXX/mangle.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Nov  2 11:54:00 2010
New Revision: 118019

URL: http://llvm.org/viewvc/llvm-project?rev=118019&view=rev
Log:
Fix a crash mangling decayed val argument-typed function.
// rdar: //8620510 and PR7666

Modified:
    cfe/trunk/lib/CodeGen/Mangle.cpp
    cfe/trunk/test/CodeGenCXX/mangle.cpp

Modified: cfe/trunk/lib/CodeGen/Mangle.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/Mangle.cpp?rev=118019&r1=118018&r2=118019&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/Mangle.cpp (original)
+++ cfe/trunk/lib/CodeGen/Mangle.cpp Tue Nov  2 11:54:00 2010
@@ -1324,7 +1324,9 @@
 }
 void CXXNameMangler::mangleType(const VariableArrayType *T) {
   Out << 'A';
-  mangleExpression(T->getSizeExpr());
+  // decayed vla types (size 0) will just be skipped.
+  if (T->getSizeExpr())
+    mangleExpression(T->getSizeExpr());
   Out << '_';
   mangleType(T->getElementType());
 }

Modified: cfe/trunk/test/CodeGenCXX/mangle.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/mangle.cpp?rev=118019&r1=118018&r2=118019&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/mangle.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/mangle.cpp Tue Nov  2 11:54:00 2010
@@ -624,3 +624,9 @@
   template <class T> void test1(decltype(f<>(T()))) {}
   template void test1<int>(decltype(f<>(int())));
 }
+
+// rdar:// 8620510
+namespace test21 {
+  // CHECK: define void @_ZN6test2112vla_arg_funcEiPA_i(
+  void vla_arg_func(int X, int a[X][X]) {}
+}