sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7b2064c4a48787819d1a3a8b40bc8e6422fd64ec)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7b2064c4a48787819d1a3a8b40bc8e6422fd64ec)
- Date: Thu, 11 Apr 2019 22:59:13 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
devel/llvm/0001-fix-compile-error-clang.patch | 32 ++++
devel/llvm/0001-fix-compile-error.patch | 202
+++++++++++++++++++++++---
devel/llvm/DEPENDS | 2
devel/llvm/DETAILS | 20 +-
devel/llvm/HISTORY | 10 +
5 files changed, 234 insertions(+), 32 deletions(-)
New commits:
commit 7b2064c4a48787819d1a3a8b40bc8e6422fd64ec
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
devel/llvm: version 8.0.0, once again
diff --git a/devel/llvm/0001-fix-compile-error-clang.patch
b/devel/llvm/0001-fix-compile-error-clang.patch
index 9a47821..c3de92e 100644
--- a/devel/llvm/0001-fix-compile-error-clang.patch
+++ b/devel/llvm/0001-fix-compile-error-clang.patch
@@ -142,3 +142,35 @@
llvm-5.0.1.src.backup/tools/clang/tools/driver/cc1as_main.cpp
if (Opts.SaveTemporaryLabels)
Ctx.setAllowTemporaryLabels(false);
if (Opts.GenDwarfForAssembly)
+diff --git a/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
a/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+--- a/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
++++ b/tools/clang/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+@@ -723,8 +723,8 @@
+ } else if (Optional<PostInitializer> PIP = P.getAs<PostInitializer>()) {
+ return
PathDiagnosticLocation(PIP->getInitializer()->getSourceLocation(),
+ SMng);
+- } else if (Optional<PreImplicitCall> PIC = P.getAs<PreImplicitCall>()) {
+- return PathDiagnosticLocation(PIC->getLocation(), SMng);
++ } else if (Optional<PreImplicitCall> pic = P.getAs<PreImplicitCall>()) {
++ return PathDiagnosticLocation(pic->getLocation(), SMng);
+ } else if (Optional<PostImplicitCall> PIE = P.getAs<PostImplicitCall>()) {
+ return PathDiagnosticLocation(PIE->getLocation(), SMng);
+ } else if (Optional<CallEnter> CE = P.getAs<CallEnter>()) {
+diff --git a/tools/opt/NewPMDriver.cpp b/tools/opt/NewPMDriver.cpp
+--- a/tools/opt/NewPMDriver.cpp
++++ b/tools/opt/NewPMDriver.cpp
+@@ -245,11 +245,11 @@
+ else
+ P = None;
+ }
+- PassInstrumentationCallbacks PIC;
++ PassInstrumentationCallbacks pic;
+ StandardInstrumentations SI;
+- SI.registerCallbacks(PIC);
++ SI.registerCallbacks(pic);
+
+- PassBuilder PB(TM, P, &PIC);
++ PassBuilder PB(TM, P, &pic);
+ registerEPCallbacks(PB, VerifyEachPass, DebugPM);
+
+ // Load requested pass plugins and let them register pass builder
callbacks
diff --git a/devel/llvm/0001-fix-compile-error.patch
b/devel/llvm/0001-fix-compile-error.patch
index b98fa7c..762e74e 100644
--- a/devel/llvm/0001-fix-compile-error.patch
+++ b/devel/llvm/0001-fix-compile-error.patch
@@ -54,55 +54,56 @@ diff --git a/lib/Transforms/Scalar/LICM.cpp
b/lib/Transforms/Scalar/LICM.cpp
index 37b9c4b..19742d2 100644
--- a/lib/Transforms/Scalar/LICM.cpp
+++ b/lib/Transforms/Scalar/LICM.cpp
-@@ -299,7 +299,7 @@ bool LoopInvariantCodeMotion::runOnLoop(
+@@ -348,7 +348,7 @@
for (BasicBlock *ExitBlock : ExitBlocks)
InsertPts.push_back(&*ExitBlock->getFirstInsertionPt());
-
+
- PredIteratorCache PIC;
+ PredIteratorCache pic;
-
+
bool Promoted = false;
-
-@@ -321,7 +321,7 @@ bool LoopInvariantCodeMotion::runOnLoop(
- PointerMustAliases.insert(ASI.getValue());
-
- Promoted |= promoteLoopAccessesToScalars(PointerMustAliases,
ExitBlocks,
-- InsertPts, PIC, LI, DT,
TLI, L,
-+ InsertPts, pic, LI, DT,
TLI, L,
- CurAST, &SafetyInfo, ORE);
+
+@@ -371,7 +371,7 @@
+ PointerMustAliases.insert(ASI.getValue());
+
+ Promoted |= promoteLoopAccessesToScalars(
+- PointerMustAliases, ExitBlocks, InsertPts, PIC, LI, DT, TLI,
L,
++ PointerMustAliases, ExitBlocks, InsertPts, pic, LI, DT, TLI,
L,
+ CurAST.get(), &SafetyInfo, ORE);
+ }
}
-
-@@ -1145,11 +1145,11 @@ public:
+@@ -1639,12 +1639,12 @@
LoopPromoter(Value *SP, ArrayRef<const Instruction *> Insts, SSAUpdater
&S,
const SmallSetVector<Value *, 8> &PMA,
SmallVectorImpl<BasicBlock *> &LEB,
- SmallVectorImpl<Instruction *> &LIP, PredIteratorCache &PIC,
+ SmallVectorImpl<Instruction *> &LIP, PredIteratorCache &pic,
AliasSetTracker &ast, LoopInfo &li, DebugLoc dl, int
alignment,
- bool UnorderedAtomic, const AAMDNodes &AATags)
+ bool UnorderedAtomic, const AAMDNodes &AATags,
+ ICFLoopSafetyInfo &SafetyInfo)
: LoadAndStorePromoter(Insts, S), SomePtr(SP),
PointerMustAliases(PMA),
- LoopExitBlocks(LEB), LoopInsertPts(LIP), PredCache(PIC), AST(ast),
+ LoopExitBlocks(LEB), LoopInsertPts(LIP), PredCache(pic), AST(ast),
LI(li), DL(std::move(dl)), Alignment(alignment),
- UnorderedAtomic(UnorderedAtomic), AATags(AATags) {}
-
-@@ -1224,7 +1224,7 @@ bool isKnownNonEscaping(Value *Object, c
+ UnorderedAtomic(UnorderedAtomic), AATags(AATags),
SafetyInfo(SafetyInfo)
+ {}
+@@ -1723,7 +1723,7 @@
bool llvm::promoteLoopAccessesToScalars(
const SmallSetVector<Value *, 8> &PointerMustAliases,
SmallVectorImpl<BasicBlock *> &ExitBlocks,
- SmallVectorImpl<Instruction *> &InsertPts, PredIteratorCache &PIC,
+ SmallVectorImpl<Instruction *> &InsertPts, PredIteratorCache &pic,
LoopInfo *LI, DominatorTree *DT, const TargetLibraryInfo *TLI,
- Loop *CurLoop, AliasSetTracker *CurAST, LoopSafetyInfo *SafetyInfo,
+ Loop *CurLoop, AliasSetTracker *CurAST, ICFLoopSafetyInfo *SafetyInfo,
OptimizationRemarkEmitter *ORE) {
-@@ -1446,7 +1446,7 @@ bool llvm::promoteLoopAccessesToScalars(
+@@ -1943,7 +1943,7 @@
SmallVector<PHINode *, 16> NewPHIs;
SSAUpdater SSA(&NewPHIs);
LoopPromoter Promoter(SomePtr, LoopUses, SSA, PointerMustAliases,
ExitBlocks,
- InsertPts, PIC, *CurAST, *LI, DL, Alignment,
+ InsertPts, pic, *CurAST, *LI, DL, Alignment,
- SawUnorderedAtomic, AATags);
-
+ SawUnorderedAtomic, AATags, *SafetyInfo);
+
// Set up the preheader to have a definition of the value. It is the
live-out
diff --git a/lib/Transforms/Utils/PredicateInfo.cpp
b/lib/Transforms/Utils/PredicateInfo.cpp
index d4cdaed..5fcd5dd 100644
@@ -157,3 +158,162 @@ index 8782588..c5900ce 100644
if (SaveTempLabels)
Ctx.setAllowTemporaryLabels(false);
+diff --git a/include/llvm/IR/PassTimingInfo.h
b/include/llvm/IR/PassTimingInfo.h
+--- a/include/llvm/IR/PassTimingInfo.h
++++ b/include/llvm/IR/PassTimingInfo.h
+@@ -83,7 +83,7 @@
+ TimePassesHandler(const TimePassesHandler &) = delete;
+ void operator=(const TimePassesHandler &) = delete;
+
+- void registerCallbacks(PassInstrumentationCallbacks &PIC);
++ void registerCallbacks(PassInstrumentationCallbacks &pic);
+
+ private:
+ /// Dumps information for running/triggered timers, useful for debugging
+diff --git a/lib/IR/PassTimingInfo.cpp b/lib/IR/PassTimingInfo.cpp
+--- a/lib/IR/PassTimingInfo.cpp
++++ b/lib/IR/PassTimingInfo.cpp
+@@ -249,19 +249,19 @@
+ LLVM_DEBUG(dump());
+ }
+
+-void TimePassesHandler::registerCallbacks(PassInstrumentationCallbacks
&PIC) {
++void TimePassesHandler::registerCallbacks(PassInstrumentationCallbacks
&pic) {
+ if (!Enabled)
+ return;
+
+- PIC.registerBeforePassCallback(
++ pic.registerBeforePassCallback(
+ [this](StringRef P, Any) { return this->runBeforePass(P); });
+- PIC.registerAfterPassCallback(
++ pic.registerAfterPassCallback(
+ [this](StringRef P, Any) { this->runAfterPass(P); });
+- PIC.registerAfterPassInvalidatedCallback(
++ pic.registerAfterPassInvalidatedCallback(
+ [this](StringRef P) { this->runAfterPass(P); });
+- PIC.registerBeforeAnalysisCallback(
++ pic.registerBeforeAnalysisCallback(
+ [this](StringRef P, Any) { this->runBeforePass(P); });
+- PIC.registerAfterAnalysisCallback(
++ pic.registerAfterAnalysisCallback(
+ [this](StringRef P, Any) { this->runAfterPass(P); });
+ }
+
+diff -git a/include/llvm/Passes/PassBuilder.h
b/include/llvm/Passes/PassBuilder.h
+--- a/include/llvm/Passes/PassBuilder.h
++++ bc/include/llvm/Passes/PassBuilder.h
+@@ -63,7 +63,7 @@
+ class PassBuilder {
+ TargetMachine *TM;
+ Optional<PGOOptions> PGOOpt;
+- PassInstrumentationCallbacks *PIC;
++ PassInstrumentationCallbacks *pic;
+
+ public:
+ /// A struct to capture parsed pass pipeline names.
+@@ -179,8 +179,8 @@
+
+ explicit PassBuilder(TargetMachine *TM = nullptr,
+ Optional<PGOOptions> PGOOpt = None,
+- PassInstrumentationCallbacks *PIC = nullptr)
+- : TM(TM), PGOOpt(PGOOpt), PIC(PIC) {}
++ PassInstrumentationCallbacks *pic = nullptr)
++ : TM(TM), PGOOpt(PGOOpt), pic(pic) {}
+
+ /// Cross register the analysis managers through their proxies.
+ ///
+diff --git a/include/llvm/Passes/StandardInstrumentations.h
b/include/llvm/Passes/StandardInstrumentations.h
+--- a/include/llvm/Passes/StandardInstrumentations.h
++++ b/include/llvm/Passes/StandardInstrumentations.h
+@@ -36,7 +36,7 @@
+ PrintIRInstrumentation() = default;
+ ~PrintIRInstrumentation();
+
+- void registerCallbacks(PassInstrumentationCallbacks &PIC);
++ void registerCallbacks(PassInstrumentationCallbacks &pic);
+
+ private:
+ bool printBeforePass(StringRef PassID, Any IR);
+@@ -63,7 +63,7 @@
+ public:
+ StandardInstrumentations() = default;
+
+- void registerCallbacks(PassInstrumentationCallbacks &PIC);
++ void registerCallbacks(PassInstrumentationCallbacks &pic);
+ };
+ } // namespace llvm
+
+diff --git a/lib/Passes/PassRegistry.def b/lib/Passes/PassRegistry.def
+--- a/lib/Passes/PassRegistry.def
++++ b/lib/Passes/PassRegistry.def
+@@ -27,7 +27,7 @@
+ MODULE_ANALYSIS("stack-safety", StackSafetyGlobalAnalysis())
+ MODULE_ANALYSIS("targetlibinfo", TargetLibraryAnalysis())
+ MODULE_ANALYSIS("verify", VerifierAnalysis())
+-MODULE_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(PIC))
++MODULE_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(pic))
+
+ #ifndef MODULE_ALIAS_ANALYSIS
+ #define MODULE_ALIAS_ANALYSIS(NAME, CREATE_PASS)
\
+@@ -89,7 +89,7 @@
+ #endif
+ CGSCC_ANALYSIS("no-op-cgscc", NoOpCGSCCAnalysis())
+ CGSCC_ANALYSIS("fam-proxy", FunctionAnalysisManagerCGSCCProxy())
+-CGSCC_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(PIC))
++CGSCC_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(pic))
+ #undef CGSCC_ANALYSIS
+
+ #ifndef CGSCC_PASS
+@@ -128,7 +128,7 @@
+ FUNCTION_ANALYSIS("targetir",
+ TM ? TM->getTargetIRAnalysis() : TargetIRAnalysis())
+ FUNCTION_ANALYSIS("verify", VerifierAnalysis())
+-FUNCTION_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(PIC))
++FUNCTION_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(pic))
+
+ #ifndef FUNCTION_ALIAS_ANALYSIS
+ #define FUNCTION_ALIAS_ANALYSIS(NAME, CREATE_PASS)
\
+@@ -249,7 +249,7 @@
+ LOOP_ANALYSIS("no-op-loop", NoOpLoopAnalysis())
+ LOOP_ANALYSIS("access-info", LoopAccessAnalysis())
+ LOOP_ANALYSIS("ivusers", IVUsersAnalysis())
+-LOOP_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(PIC))
++LOOP_ANALYSIS("pass-instrumentation", PassInstrumentationAnalysis(pic))
+ #undef LOOP_ANALYSIS
+
+ #ifndef LOOP_PASS
+diff --git a/lib/Passes/StandardInstrumentations.cpp
b/lib/Passes/StandardInstrumentations.cpp
+--- a/lib/Passes/StandardInstrumentations.cpp
++++ b/lib/Passes/StandardInstrumentations.cpp
+@@ -220,24 +220,24 @@
+ }
+
+ void PrintIRInstrumentation::registerCallbacks(
+- PassInstrumentationCallbacks &PIC) {
++ PassInstrumentationCallbacks &pic) {
+ // BeforePass callback is not just for printing, it also saves a Module
+ // for later use in AfterPassInvalidated.
+ StoreModuleDesc = llvm::forcePrintModuleIR() &&
llvm::shouldPrintAfterPass();
+ if (llvm::shouldPrintBeforePass() || StoreModuleDesc)
+- PIC.registerBeforePassCallback(
++ pic.registerBeforePassCallback(
+ [this](StringRef P, Any IR) { return this->printBeforePass(P, IR);
});
+
+ if (llvm::shouldPrintAfterPass()) {
+- PIC.registerAfterPassCallback(
++ pic.registerAfterPassCallback(
+ [this](StringRef P, Any IR) { this->printAfterPass(P, IR); });
+- PIC.registerAfterPassInvalidatedCallback(
++ pic.registerAfterPassInvalidatedCallback(
+ [this](StringRef P) { this->printAfterPassInvalidated(P); });
+ }
+ }
+
+ void StandardInstrumentations::registerCallbacks(
+- PassInstrumentationCallbacks &PIC) {
+- PrintIR.registerCallbacks(PIC);
+- TimePasses.registerCallbacks(PIC);
++ PassInstrumentationCallbacks &pic) {
++ PrintIR.registerCallbacks(pic);
++ TimePasses.registerCallbacks(pic);
+ }
diff --git a/devel/llvm/DEPENDS b/devel/llvm/DEPENDS
index 8bdafaa..5efaadd 100755
--- a/devel/llvm/DEPENDS
+++ b/devel/llvm/DEPENDS
@@ -12,7 +12,7 @@ fi &&
optional_depends ocaml '' '' 'build bindings for OCaml' &&
optional_depends doxygen '' '' "build documentation?" &&
-optional_depends libffi '-DLLVM_ENABLE_FFI=1' '' 'use sytem FFI'
+optional_depends libffi '-DLLVM_ENABLE_FFI=1
-DFFI_INCLUDE_DIR=/usr/lib/libffi-3.2.1/include' '' 'use sytem FFI' &&
if [[ "$LLVM_WITH_LLDB" == y ]]; then
depends swig &&
depends libedit &&
diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index af9001b..f70e4b9 100755
--- a/devel/llvm/DETAILS
+++ b/devel/llvm/DETAILS
@@ -1,34 +1,34 @@
SPELL=llvm
- VERSION="7.0.1"
+ VERSION="8.0.0"
SOURCE="${SPELL}-${VERSION}.src.tar.xz"
SOURCE2=$SOURCE.sig
- SOURCE_URL[0]=http://${SPELL}.org/releases/${VERSION}/${SOURCE}
+ SOURCE_URL[0]=https://${SPELL}.org/releases/${VERSION}/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=llvm.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
if [[ "$LLVM_WITH_CLANG" == y ]]; then
SOURCE3="cfe-${VERSION}.src.tar.xz"
- SOURCE3_URL[0]="http://${SPELL}.org/releases/${VERSION}/${SOURCE3}";
+ SOURCE3_URL[0]="https://${SPELL}.org/releases/${VERSION}/${SOURCE3}";
SOURCE4="$SOURCE3.sig"
SOURCE4_URL[0]="${SOURCE3_URL[0]}.sig"
SOURCE3_GPG="llvm.gpg:$SOURCE4:UPSTREAM_KEY"
SOURCE4_IGNORE="signature"
SOURCE5="compiler-rt-${VERSION}.src.tar.xz"
- SOURCE5_URL[0]="http://${SPELL}.org/releases/${VERSION}/${SOURCE5}";
+ SOURCE5_URL[0]="https://${SPELL}.org/releases/${VERSION}/${SOURCE5}";
SOURCE6="$SOURCE5.sig"
SOURCE5_GPG="llvm.gpg:$SOURCE6:UPSTREAM_KEY"
SOURCE6_URL[0]="${SOURCE5_URL[0]}.sig"
SOURCE6_IGNORE="signature"
SOURCE9="clang-tools-extra-${VERSION}.src.tar.xz"
- SOURCE9_URL[0]="http://llvm.org/releases/${VERSION}/${SOURCE9}";
+ SOURCE9_URL[0]="https://llvm.org/releases/${VERSION}/${SOURCE9}";
SOURCE10="$SOURCE9.sig"
- SOURCE10_URL[0]="http://llvm.org/releases/${VERSION}/${SOURCE10}";
+ SOURCE10_URL[0]="https://llvm.org/releases/${VERSION}/${SOURCE10}";
SOURCE10_IGNORE=signature
SOURCE9_GPG="llvm.gpg:$SOURCE10:UPSTREAM_KEY"
fi
if [[ "$LLVM_WITH_LLDB" == y ]]; then
SOURCE7="lldb-${VERSION}.src.tar.xz"
- SOURCE7_URL[0]="http://${SPELL}.org/releases/${VERSION}/${SOURCE7}";
+ SOURCE7_URL[0]="https://${SPELL}.org/releases/${VERSION}/${SOURCE7}";
SOURCE8="$SOURCE7.sig"
SOURCE8_URL[0]="${SOURCE7_URL[0]}.sig"
SOURCE7_GPG="llvm.gpg:$SOURCE8:UPSTREAM_KEY"
@@ -36,7 +36,7 @@ if [[ "$LLVM_WITH_LLDB" == y ]]; then
fi
if [[ "$LLVM_WITH_POLLY" == y ]]; then
SOURCE11="polly-${VERSION}.src.tar.xz"
- SOURCE11_URL[0]="http://${SPELL}.org/releases/${VERSION}/${SOURCE11}";
+ SOURCE11_URL[0]="https://${SPELL}.org/releases/${VERSION}/${SOURCE11}";
SOURCE12="$SOURCE11.sig"
SOURCE12_URL[0]="${SOURCE11_URL[0]}.sig"
SOURCE11_GPG="llvm.gpg:$SOURCE12:UPSTREAM_KEY"
@@ -44,14 +44,14 @@ if [[ "$LLVM_WITH_POLLY" == y ]]; then
fi
if [[ "$LLVM_WITH_LLD" == y ]]; then
SOURCE13="lld-${VERSION}.src.tar.xz"
- SOURCE13_URL[0]="https://${SPELL}.org/releases/${VERSION}/${SOURCE13}";
+ SOURCE13_URL[0]="httpss://${SPELL}.org/releases/${VERSION}/${SOURCE13}"
SOURCE14="$SOURCE13.sig"
SOURCE14_URL[0]="${SOURCE13_URL[0]}.sig"
SOURCE13_GPG="llvm.gpg:$SOURCE14:UPSTREAM_KEY"
SOURCE14_IGNORE="signature"
fi
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}.src"
- WEB_SITE="http://llvm.org";
+ WEB_SITE="https://llvm.org";
LICENSE[0]=BSD
ENTERED=20081115
SHORT="A novel compiler infrastructure for the optimization of
programs."
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index cca6352..9d8bd27 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,6 +1,16 @@
2019-04-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: add
support for llvm's linker
+2019-03-21 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, 0001-fix-compile-error.patch,
+ 0001-fix-compile-error-clang.patch: reenabled and updated,
+ otherwise compilation fails for PIC code generation
+
+2019-03-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.0.0
+ * DEPENDS: improve libffi flags
+ * PRE_BUILD: disbale at present, build without patching
+
2018-12-15 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 7.0.1
- [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (7b2064c4a48787819d1a3a8b40bc8e6422fd64ec), Pavel Vinogradov, 04/11/2019
Archive powered by MHonArc 2.6.24.