From owner-svn-src-vendor@FreeBSD.ORG Wed Jan 1 00:37:44 2014 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 19343DCE; Wed, 1 Jan 2014 00:37:44 +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 ED4D11D3C; Wed, 1 Jan 2014 00:37:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s010bhJ2063068; Wed, 1 Jan 2014 00:37:43 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s010bh1m063064; Wed, 1 Jan 2014 00:37:43 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401010037.s010bh1m063064@svn.freebsd.org> From: Dimitry Andric Date: Wed, 1 Jan 2014 00:37:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r260148 - in vendor/clang/dist: docs lib/Basic lib/Parse test/Parser X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 00:37:44 -0000 Author: dim Date: Wed Jan 1 00:37:42 2014 New Revision: 260148 URL: http://svnweb.freebsd.org/changeset/base/260148 Log: Vendor import of clang RELEASE_34/final tag r197956 (effectively, 3.4 release): https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_34/final@197956 Modified: vendor/clang/dist/docs/ReleaseNotes.rst vendor/clang/dist/lib/Basic/Version.cpp vendor/clang/dist/lib/Parse/ParseDeclCXX.cpp vendor/clang/dist/test/Parser/recovery.cpp Modified: vendor/clang/dist/docs/ReleaseNotes.rst ============================================================================== --- vendor/clang/dist/docs/ReleaseNotes.rst Wed Jan 1 00:37:10 2014 (r260147) +++ vendor/clang/dist/docs/ReleaseNotes.rst Wed Jan 1 00:37:42 2014 (r260148) @@ -18,23 +18,22 @@ documentation `_. -For more information about Clang or LLVM, including information about -the latest release, please check out the main `Clang Web -Site `_ or the `LLVM Web -Site `_. - -Note that if you are reading this file from a Subversion checkout or the -main Clang web page, this document applies to the *next* release, not -the current one. To see the release notes for a specific release, please -see the `releases page `_. +For more information about Clang or LLVM, including information about the +latest release, please check out the main `Clang Web Site +`_ or the `LLVM Web Site `_. + +Note that if you are reading this file from a Subversion checkout or the main +Clang web page, this document applies to the *next* release, not the current +one. To see the release notes for a specific release, please see the `releases +page `_. What's New in Clang 3.4? ======================== -Some of the major new features and improvements to Clang are listed -here. Generic improvements to Clang as a whole or to its underlying -infrastructure are described first, followed by language-specific -sections with improvements to Clang's support for those languages. +Some of the major new features and improvements to Clang are listed here. +Generic improvements to Clang as a whole or to its underlying infrastructure +are described first, followed by language-specific sections with improvements +to Clang's support for those languages. Last release which will build as C++98 -------------------------------------- @@ -58,9 +57,9 @@ Major New Features Improvements to Clang's diagnostics ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Clang's diagnostics are constantly being improved to catch more issues, -explain them more clearly, and provide more accurate source information -about them. The improvements since the 3.3 release include: +Clang's diagnostics are constantly being improved to catch more issues, explain +them more clearly, and provide more accurate source information about them. The +improvements since the 3.3 release include: - -Wheader-guard warns on mismatches between the #ifndef and #define lines in a header guard. Modified: vendor/clang/dist/lib/Basic/Version.cpp ============================================================================== --- vendor/clang/dist/lib/Basic/Version.cpp Wed Jan 1 00:37:10 2014 (r260147) +++ vendor/clang/dist/lib/Basic/Version.cpp Wed Jan 1 00:37:42 2014 (r260148) @@ -36,7 +36,7 @@ std::string getClangRepositoryPath() { // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us // pick up a tag in an SVN export, for example. - StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/branches/release_34/lib/Basic/Version.cpp $"); + StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_34/final/lib/Basic/Version.cpp $"); if (URL.empty()) { URL = SVNRepository.slice(SVNRepository.find(':'), SVNRepository.find("/lib/Basic")); Modified: vendor/clang/dist/lib/Parse/ParseDeclCXX.cpp ============================================================================== --- vendor/clang/dist/lib/Parse/ParseDeclCXX.cpp Wed Jan 1 00:37:10 2014 (r260147) +++ vendor/clang/dist/lib/Parse/ParseDeclCXX.cpp Wed Jan 1 00:37:42 2014 (r260148) @@ -1427,7 +1427,13 @@ void Parser::ParseClassSpecifier(tok::To << DeclSpec::getSpecifierName(TagType); } - SkipUntil(tok::comma, StopAtSemi); + // If we are parsing a definition and stop at a base-clause, continue on + // until the semicolon. Continuing from the comma will just trick us into + // thinking we are seeing a variable declaration. + if (TUK == Sema::TUK_Definition && Tok.is(tok::colon)) + SkipUntil(tok::semi, StopBeforeMatch); + else + SkipUntil(tok::comma, StopAtSemi); return; } Modified: vendor/clang/dist/test/Parser/recovery.cpp ============================================================================== --- vendor/clang/dist/test/Parser/recovery.cpp Wed Jan 1 00:37:10 2014 (r260147) +++ vendor/clang/dist/test/Parser/recovery.cpp Wed Jan 1 00:37:42 2014 (r260148) @@ -119,3 +119,9 @@ void MissingSemiInFunction() { struct Inner4 {} // ok, no missing ';' here Inner5; } + +namespace PR17084 { +enum class EnumID {}; +template struct TempID; +template <> struct TempID : BadType, EnumID::Garbage; // expected-error{{use of undeclared identifier 'BadType'}} +}