[PATCH] Fix for http://llvm.org/PR21915: Assertion Failed on multidimensional VLA in function arguments.

[Alexey Bataev]

John, fixed your comments


http://reviews.llvm.org/D6655

Files:
  lib/CodeGen/CodeGenFunction.h
  test/CodeGen/vlt_to_pointer.c
  test/CodeGenCXX/vlt_to_reference.cpp

Index: test/CodeGenCXX/vlt_to_reference.cpp
===================================================================
--- test/CodeGenCXX/vlt_to_reference.cpp
+++ test/CodeGenCXX/vlt_to_reference.cpp
@@ -0,0 +1,22 @@
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
+
+// CHECK-LABEL: @main
+
+struct dyn_array { 
+    int size;
+    int data[];
+};
+
+int foo(dyn_array **&d) {
+  return (*d)->data[1];
+}
+
+int main()
+{
+    dyn_array **d;
+    return foo(d);
+
+    // CHECK: call {{.+}} @{{.+}}foo{{.+}}(
+    // CHECK: ret i{{[0-9]+}}
+}
+
Index: test/CodeGen/vlt_to_pointer.c
===================================================================
--- test/CodeGen/vlt_to_pointer.c
+++ test/CodeGen/vlt_to_pointer.c
@@ -0,0 +1,30 @@
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
+
+int c[1][3*2];
+// CHECK: @{{.+}} = {{.*}} global [1 x [6 x {{i[0-9]+}}]] zeroinitializer
+
+// CHECK-LABEL: @f
+int f(int * const m, int (**v)[*m * 2])
+{
+    return &(c[0][*m]) == &((*v)[0][*m]);
+    // CHECK: icmp
+    // CHECK: ret i{{[0-9]+}}
+}
+
+// CHECK-LABEL: @test
+int test(int n, int (*(*fn)(void))[n]) {
+  return (*fn())[0];
+}
+
+// CHECK-LABEL: @main
+int main()
+{
+    int m = 3;
+    int (*d)[3*2] = c;
+    int (*fn[m])(void);
+    return f(&m, &d) + test(m, &fn);
+
+    // CHECK: call {{.+}} @f(
+    // CHECK: ret i{{[0-9]+}}
+}
+
Index: lib/CodeGen/CodeGenFunction.h
===================================================================
--- lib/CodeGen/CodeGenFunction.h
+++ lib/CodeGen/CodeGenFunction.h
@@ -2748,17 +2748,16 @@
 #ifndef NDEBUG
         QualType ArgType = *I;
         QualType ActualArgType = Arg->getType();
-        if (ArgType->isPointerType() && ActualArgType->isPointerType()) {
-          QualType ActualBaseType =
-              ActualArgType->getAs<PointerType>()->getPointeeType();
-          QualType ArgBaseType =
-              ArgType->getAs<PointerType>()->getPointeeType();
-          if (ArgBaseType->isVariableArrayType()) {
-            if (const VariableArrayType *VAT =
-                    getContext().getAsVariableArrayType(ActualBaseType)) {
-              if (!VAT->getSizeExpr())
-                ActualArgType = ArgType;
-            }
+        QualType ArgBaseType = ArgType.getNonReferenceType();
+        QualType ActualBaseType = ActualArgType;
+        while (ArgBaseType->isPointerType() &&
+               ActualBaseType->isPointerType()) {
+          ActualBaseType =
+              ActualBaseType->castAs<PointerType>()->getPointeeType();
+          ArgBaseType = ArgBaseType->castAs<PointerType>()->getPointeeType();
+          if (ArgBaseType->isVariablyModifiedType()) {
+            ActualArgType = ArgType;
+            break;
           }
         }
         assert(getContext()

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D6655.17330.patch
Type: text/x-patch
Size: 2757 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20141216/41e15a31/attachment.bin>