From owner-svn-src-projects@freebsd.org Fri Jan 8 17:32:43 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C63E4A67D93 for ; Fri, 8 Jan 2016 17:32:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7D66E1820; Fri, 8 Jan 2016 17:32:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u08HWgPp020843; Fri, 8 Jan 2016 17:32:42 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u08HWgLa020841; Fri, 8 Jan 2016 17:32:42 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201601081732.u08HWgLa020841@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 8 Jan 2016 17:32:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r293428 - in projects/clang380-import: contrib/llvm/include/llvm lib/clang/libllvmsupport X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2016 17:32:43 -0000 Author: dim Date: Fri Jan 8 17:32:42 2016 New Revision: 293428 URL: https://svnweb.freebsd.org/changeset/base/293428 Log: As submitted upstream in a review, avoid using undefined behavior in llvm's LinkAllPasses.h. This caused some of the calls not to be emitted, if the optimization level was -O2 or higher. Conversely, if you used -O1 or lower, calls to e.g. RunningOnValgrind() would be emitted, leading to link failures, because we did not include Valgrind.cpp into libllvmsupport. Therefore, add it unconditionally. Noticed by: ian Modified: projects/clang380-import/contrib/llvm/include/llvm/LinkAllPasses.h projects/clang380-import/lib/clang/libllvmsupport/Makefile Modified: projects/clang380-import/contrib/llvm/include/llvm/LinkAllPasses.h ============================================================================== --- projects/clang380-import/contrib/llvm/include/llvm/LinkAllPasses.h Fri Jan 8 17:27:23 2016 (r293427) +++ projects/clang380-import/contrib/llvm/include/llvm/LinkAllPasses.h Fri Jan 8 17:32:42 2016 (r293428) @@ -185,9 +185,9 @@ namespace { (void)new llvm::IntervalPartition(); (void)new llvm::ScalarEvolutionWrapperPass(); - ((llvm::Function*)nullptr)->viewCFGOnly(); + ((llvm::Function*)1)->viewCFGOnly(); llvm::RGPassManager RGM; - ((llvm::RegionPass*)nullptr)->runOnRegion((llvm::Region*)nullptr, RGM); + ((llvm::RegionPass*)1)->runOnRegion((llvm::Region*)nullptr, RGM); llvm::AliasSetTracker X(*(llvm::AliasAnalysis*)nullptr); X.add(nullptr, 0, llvm::AAMDNodes()); // for -print-alias-sets (void) llvm::AreStatisticsEnabled(); Modified: projects/clang380-import/lib/clang/libllvmsupport/Makefile ============================================================================== --- projects/clang380-import/lib/clang/libllvmsupport/Makefile Fri Jan 8 17:27:23 2016 (r293427) +++ projects/clang380-import/lib/clang/libllvmsupport/Makefile Fri Jan 8 17:32:42 2016 (r293428) @@ -78,6 +78,7 @@ SRCS= APFloat.cpp \ Triple.cpp \ Twine.cpp \ Unicode.cpp \ + Valgrind.cpp \ YAMLParser.cpp \ YAMLTraits.cpp \ circular_raw_ostream.cpp \ @@ -101,8 +102,7 @@ SRCS+= ARMWinEH.cpp \ .endif .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" -SRCS+= Memory.cpp \ - Valgrind.cpp +SRCS+= Memory.cpp .endif .include "../clang.lib.mk"