Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 devel/llvm/0001-fix-compile-error-clang.patch            |    4 
 devel/llvm/0001-fix-compile-error.patch                  |   85 
+++++++--------
 devel/llvm/0001-fix-scan-view-s-module-search-path.patch |   25 ----
 devel/llvm/DETAILS                                       |    2 
 devel/llvm/HISTORY                                       |    6 +
 5 files changed, 50 insertions(+), 72 deletions(-)

New commits:
commit 1d20f132f053962d5d92d5c4426b9ae37d7386fb
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/llvm: version 6.0.0
    
    P. S. Mesa 17.3.7 is fine with it.

diff --git a/devel/llvm/0001-fix-compile-error-clang.patch 
b/devel/llvm/0001-fix-compile-error-clang.patch
index fcf7844..c453d42 100644
--- a/devel/llvm/0001-fix-compile-error-clang.patch
+++ b/devel/llvm/0001-fix-compile-error-clang.patch
@@ -127,8 +127,8 @@ diff -Naupr 
llvm-5.0.1.src/tools/clang/tools/driver/cc1as_main.cpp llvm-5.0.1.sr
 +    pic = false;
    }
  
--  MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), PIC, CodeModel::Default, 
Ctx);
-+  MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), pic, CodeModel::Default, 
Ctx);
+-  MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), PIC, Ctx);
++  MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), pic, Ctx);
    if (Opts.SaveTemporaryLabels)
      Ctx.setAllowTemporaryLabels(false);
    if (Opts.GenDwarfForAssembly)
diff --git a/devel/llvm/0001-fix-compile-error.patch 
b/devel/llvm/0001-fix-compile-error.patch
index 68aee73..a89ad76 100644
--- a/devel/llvm/0001-fix-compile-error.patch
+++ b/devel/llvm/0001-fix-compile-error.patch
@@ -12,34 +12,32 @@ diff --git a/include/llvm/MC/MCObjectFileInfo.h 
b/include/llvm/MC/MCObjectFileIn
 index 4d63444..a571f4a 100644
 --- a/include/llvm/MC/MCObjectFileInfo.h
 +++ b/include/llvm/MC/MCObjectFileInfo.h
-@@ -191,7 +191,7 @@ protected:
+@@ -198,7 +198,7 @@ protected:
    MCSection *SXDataSection;
- 
+
  public:
--  void InitMCObjectFileInfo(const Triple &TT, bool PIC, CodeModel::Model CM,
-+  void InitMCObjectFileInfo(const Triple &TT, bool pic, CodeModel::Model CM,
-                             MCContext &ctx);
- 
+-  void InitMCObjectFileInfo(const Triple &TT, bool PIC, MCContext &ctx,
++  void InitMCObjectFileInfo(const Triple &TT, bool pic, MCContext &ctx,
+                             bool LargeCodeModel = false);
+
    bool getSupportsWeakOmittedEHFrame() const {
 diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
 index 21c5516..0388986 100644
 --- a/lib/MC/MCObjectFileInfo.cpp
 +++ b/lib/MC/MCObjectFileInfo.cpp
-@@ -848,10 +848,10 @@ void MCObjectFileInfo::initWasmMCObjectFileInfo(const 
Triple &T) {
+@@ -854,10 +854,10 @@ void MCObjectFileInfo::initWasmMCObjectF
    // TODO: Define more sections.
  }
- 
+
 -void MCObjectFileInfo::InitMCObjectFileInfo(const Triple &TheTriple, bool 
PIC,
 +void MCObjectFileInfo::InitMCObjectFileInfo(const Triple &TheTriple, bool 
pic,
-                                             CodeModel::Model cm,
-                                             MCContext &ctx) {
+                                             MCContext &ctx,
+                                             bool LargeCodeModel) {
 -  PositionIndependent = PIC;
 +  PositionIndependent = pic;
-   CMModel = cm;
    Ctx = &ctx;
- 
--- 
-2.15.1
+
+   // Common.
 
 From e3e9b1405dcff106ca6547bdd33c605dc4d8ecb8 Mon Sep 17 00:00:00 2001
 From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
@@ -56,26 +54,27 @@ 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
-@@ -287,14 +287,14 @@ bool LoopInvariantCodeMotion::runOnLoop(Loop *L, 
AliasAnalysis *AA,
+@@ -299,7 +299,7 @@ bool LoopInvariantCodeMotion::runOnLoop(
        for (BasicBlock *ExitBlock : ExitBlocks)
          InsertPts.push_back(&*ExitBlock->getFirstInsertionPt());
- 
+
 -      PredIteratorCache PIC;
 +      PredIteratorCache pic;
- 
+
        bool Promoted = false;
- 
-       // Loop over all of the alias sets in the tracker object.
-       for (AliasSet &AS : *CurAST)
-         Promoted |=
--            promoteLoopAccessesToScalars(AS, ExitBlocks, InsertPts, PIC, 
LI, DT,
-+            promoteLoopAccessesToScalars(AS, ExitBlocks, InsertPts, pic, 
LI, DT,
-                                          TLI, L, CurAST, &SafetyInfo, ORE);
- 
-       // Once we have promoted values across the loop body we have to
-@@ -963,11 +963,11 @@ public:
+
+@@ -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);
+       }
+
+@@ -1145,11 +1145,11 @@ public:
    LoopPromoter(Value *SP, ArrayRef<const Instruction *> Insts, SSAUpdater 
&S,
-                SmallPtrSetImpl<Value *> &PMA,
+                const SmallSetVector<Value *, 8> &PMA,
                 SmallVectorImpl<BasicBlock *> &LEB,
 -               SmallVectorImpl<Instruction *> &LIP, PredIteratorCache &PIC,
 +               SmallVectorImpl<Instruction *> &LIP, PredIteratorCache &pic,
@@ -85,25 +84,25 @@ index 37b9c4b..19742d2 100644
 -        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) {}
- 
-@@ -1017,7 +1017,7 @@ public:
- ///
+         UnorderedAtomic(UnorderedAtomic), AATags(AATags) {}
+
+@@ -1224,7 +1224,7 @@ bool isKnownNonEscaping(Value *Object, c
  bool llvm::promoteLoopAccessesToScalars(
-     AliasSet &AS, SmallVectorImpl<BasicBlock *> &ExitBlocks,
+     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,
      OptimizationRemarkEmitter *ORE) {
-@@ -1267,7 +1267,7 @@ bool llvm::promoteLoopAccessesToScalars(
+@@ -1446,7 +1446,7 @@ bool llvm::promoteLoopAccessesToScalars(
    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);
- 
+
    // 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
@@ -143,20 +142,18 @@ index 8782588..c5900ce 100644
 @@ -128,7 +128,7 @@ MAttrs("mattr",
    cl::desc("Target specific attributes (-mattr=help for details)"),
    cl::value_desc("a1,+a2,-a3,..."));
- 
+
 -static cl::opt<bool> PIC("position-independent",
 +static cl::opt<bool> pic("position-independent",
                           cl::desc("Position independent"), cl::init(false));
- 
- static cl::opt<llvm::CodeModel::Model>
-@@ -506,7 +506,7 @@ int main(int argc, char **argv) {
+
+ static cl::opt<bool>
+@@ -496,7 +496,7 @@ int main(int argc, char **argv) {
    // MCObjectFileInfo needs a MCContext reference in order to initialize 
itself.
    MCObjectFileInfo MOFI;
    MCContext Ctx(MAI.get(), MRI.get(), &MOFI, &SrcMgr);
--  MOFI.InitMCObjectFileInfo(TheTriple, PIC, CMModel, Ctx);
-+  MOFI.InitMCObjectFileInfo(TheTriple, pic, CMModel, Ctx);
- 
+-  MOFI.InitMCObjectFileInfo(TheTriple, PIC, Ctx, LargeCodeModel);
++  MOFI.InitMCObjectFileInfo(TheTriple, pic, Ctx, LargeCodeModel);
+
    if (SaveTempLabels)
      Ctx.setAllowTemporaryLabels(false);
--- 
-2.15.1
diff --git a/devel/llvm/0001-fix-scan-view-s-module-search-path.patch 
b/devel/llvm/0001-fix-scan-view-s-module-search-path.patch
deleted file mode 100644
index 2c89cf0..0000000
--- a/devel/llvm/0001-fix-scan-view-s-module-search-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c8828d072aec847801d4672cbe1c1f8105801117 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sat, 10 May 2014 08:46:26 +0200
-Subject: [PATCH] fix scan-view's module search path
-
----
- tools/scan-view/scan-view | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/scan-view/scan-view b/tools/scan-view/scan-view
-index fb27da6..5b66ff9 100755
---- a/tools/scan-view/scan-view
-+++ b/tools/scan-view/scan-view
-@@ -10,6 +10,8 @@ import time
- import urllib
- import webbrowser
- 
-+sys.path.append("/usr/share/llvm/scan-view")
-+
- # How long to wait for server to start.
- kSleepTimeout = .05
- kMaxSleeps = int(60 / kSleepTimeout)
--- 
-1.9.1
-
diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index 36832bf..876d41d 100755
--- a/devel/llvm/DETAILS
+++ b/devel/llvm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=llvm
-         VERSION=5.0.1
+         VERSION="6.0.0"
           SOURCE="${SPELL}-${VERSION}.src.tar.xz"
          SOURCE2=$SOURCE.sig
    SOURCE_URL[0]=http://${SPELL}.org/releases/${VERSION}/${SOURCE}
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 3ba079e..c9a5e18 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,9 @@
+2018-03-22 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 6.0.0
+       * 0001-fix-compile-error.patch, 0001-fix-compile-error-clang.patch:
+         updated the patches
+       * 0001-fix-scan-view-s-module-search-path.patch: removed
+
 2018-03-06 Eric Sandall <sandalle AT sourcemage.org>
        * 0001-fix-compile-error.patch: Remove CommonArgs.cpp and 
cs1as_main.cpp
          patch as these files don't exist in llvm source.