disable Anders' recent VLA patch, this fixes PR3209.

llvm-svn: 60989

2 files changed, 11 insertions, 2 deletions

diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index 62684bae496..1c72ba12280 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/lib/CodeGen/CGDecl.cpp
@@ -160,6 +160,15 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) {
         D.getStorageClass() == VarDecl::Register ? ".reg." : ".auto.";
       DeclPtr = GenerateStaticBlockVarDecl(D, true, Class);
     }
+  } else if (1) {
+    // FIXME: The code below is disabled because is causes a regression in the
+    // testsuite.
+    CGM.ErrorUnsupported(&D, "variable-length array"); 
+    
+    const llvm::Type *LTy = ConvertType(Ty);
+    llvm::AllocaInst *Alloc = 
+      CreateTempAlloca(LTy, D.getIdentifier()->getName());
+    DeclPtr = Alloc;
   } else {
     const VariableArrayType *VAT = getContext().getAsVariableArrayType(Ty);
 
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index 857a40e6c8d..ffb51647826 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -667,8 +667,8 @@ ScalarExprEmitter::VisitSizeOfAlignOfExpr(const SizeOfAlignOfExpr *E) {
         CGF.getContext().getAsVariableArrayType(TypeToSize)) {
     if (E->isSizeOf())
       return CGF.GetVLASize(VAT);
-    else
-      assert(0 && "alignof VLAs not implemented yet");
+    // FIXME: This should be an UNSUPPORTED error.
+    assert(0 && "alignof VLAs not implemented yet");
   }
   
   std::pair<uint64_t, unsigned> Info = CGF.getContext().getTypeInfo(TypeToSize);