Index: lib/CodeGen/CodeGenFunction.h
===================================================================
--- lib/CodeGen/CodeGenFunction.h
+++ lib/CodeGen/CodeGenFunction.h
@@ -2748,16 +2748,20 @@
 #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();
+        QualType ArgBaseType = ArgType;
+        QualType ActualBaseType = ActualArgType;
+        while (ArgBaseType->isPointerType() &&
+               ActualBaseType->isPointerType()) {
+          ActualBaseType =
+              ActualBaseType->getAs<PointerType>()->getPointeeType();
+          ArgBaseType = ArgBaseType->getAs<PointerType>()->getPointeeType();
           if (ArgBaseType->isVariableArrayType()) {
             if (const VariableArrayType *VAT =
                     getContext().getAsVariableArrayType(ActualBaseType)) {
-              if (!VAT->getSizeExpr())
+              if (!VAT->getSizeExpr()) {
                 ActualArgType = ArgType;
+                break;
+              }
             }
           }
         }
Index: test/CodeGen/vla_to_pointer.c
===================================================================
--- test/CodeGen/vla_to_pointer.c
+++ test/CodeGen/vla_to_pointer.c
@@ -0,0 +1,22 @@
+// 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: @main
+int main()
+{
+    int m = 3;
+    int (*d)[3*2] = c;
+    return f(&m, &d);
+    // CHECK: call {{.+}} @f(
+    // CHECK: ret i{{[0-9]+}}
+}
+