From owner-svn-src-head@FreeBSD.ORG Sun Feb 9 20:52:48 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 637C2BA6; Sun, 9 Feb 2014 20:52:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4BE3A1676; Sun, 9 Feb 2014 20:52:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19Kqm1c020086; Sun, 9 Feb 2014 20:52:48 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19KqmjN020085; Sun, 9 Feb 2014 20:52:48 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201402092052.s19KqmjN020085@svn.freebsd.org> From: Dimitry Andric Date: Sun, 9 Feb 2014 20:52:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261680 - head/contrib/llvm/tools/clang/lib/Sema X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 20:52:48 -0000 Author: dim Date: Sun Feb 9 20:52:47 2014 New Revision: 261680 URL: http://svnweb.freebsd.org/changeset/base/261680 Log: Pull in r200899 from upstream clang trunk: Allow transformation of VariableArray to ConstantArray. In the following code: struct A { static const int sz; }; template void f() { T arr[A::sz]; } the array 'arr' is represented as a variable size array in the template. If 'A::sz' gets value below in the translation unit, the array in instantiation can turn into constant size array. This change fixes PR18633. Differential Revision: http://llvm-reviews.chandlerc.com/D2688 This fixes "Assertion failed: (T::isKind(*this)), function castAs" errors, which can occur when building the security/quantis port. Reported by: ale MFC after: 3 days Modified: head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h Modified: head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h ============================================================================== --- head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h Sun Feb 9 20:32:27 2014 (r261679) +++ head/contrib/llvm/tools/clang/lib/Sema/TreeTransform.h Sun Feb 9 20:52:47 2014 (r261680) @@ -3837,7 +3837,9 @@ TreeTransform::TransformVariabl return QualType(); } - VariableArrayTypeLoc NewTL = TLB.push(Result); + // We might have constant size array now, but fortunately it has the same + // location layout. + ArrayTypeLoc NewTL = TLB.push(Result); NewTL.setLBracketLoc(TL.getLBracketLoc()); NewTL.setRBracketLoc(TL.getRBracketLoc()); NewTL.setSizeExpr(Size);