From owner-svn-src-stable-9@FreeBSD.ORG Sat Feb 14 23:25:40 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5223EAD; Sat, 14 Feb 2015 23:25:40 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E13D3B0; Sat, 14 Feb 2015 23:25:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ENPe3x046633; Sat, 14 Feb 2015 23:25:40 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ENPeJJ046632; Sat, 14 Feb 2015 23:25:40 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502142325.t1ENPeJJ046632@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 14 Feb 2015 23:25:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r278788 - in stable: 10/contrib/llvm/tools/clang/lib/Serialization 9/contrib/llvm/tools/clang/lib/Serialization X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Feb 2015 23:25:40 -0000 Author: dim Date: Sat Feb 14 23:25:39 2015 New Revision: 278788 URL: https://svnweb.freebsd.org/changeset/base/278788 Log: Pull in r201130 from upstream clang trunk (by Ted Kremenek): Fix PCH deserialization bug with local static symbols being treated as local extern. This triggered a miscompilation of code using Boost's function_template.hpp when it was included inside a PCH file. A local static within that header would be treated as local extern, resulting in the wrong mangling. This only occurred during PCH deserialization. Fixes and . This fixes a crash in audio/murmur, which is using both PCH and Boost. Direct commit to stable/10 and stable/9, since head has clang 3.5.1, which already includes this change. Reported by: smh PR: 197389 Modified: stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp Changes in other areas also in this revision: Modified: stable/10/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp Modified: stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp ============================================================================== --- stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp Sat Feb 14 22:12:17 2015 (r278787) +++ stable/9/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp Sat Feb 14 23:25:39 2015 (r278788) @@ -971,7 +971,7 @@ ASTDeclReader::RedeclarableResult ASTDec VD->setCachedLinkage(VarLinkage); // Reconstruct the one piece of the IdentifierNamespace that we need. - if (VarLinkage != NoLinkage && + if (VD->getStorageClass() == SC_Extern && VarLinkage != NoLinkage && VD->getLexicalDeclContext()->isFunctionOrMethod()) VD->setLocalExternDecl();