[pkgsrc/trunk]: pkgsrc/devel/creduce creduce: fix for LLVM 7.0

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a66c5d4ba1e
branches:  trunk
changeset: 326668:9a66c5d4ba1e
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Dec 12 12:44:42 2018 +0000

description:
creduce: fix for LLVM 7.0

diffstat:

 devel/creduce/Makefile                                              |   4 +-
 devel/creduce/distinfo                                              |   5 +-
 devel/creduce/patches/patch-clang__delta_ExpressionDetector.cpp     |  27 ++++++++++
 devel/creduce/patches/patch-clang__delta_RemoveUnusedEnumMember.cpp |  27 ++++++++++
 devel/creduce/patches/patch-clang__delta_TransformationManager.cpp  |  16 +++++
 5 files changed, 76 insertions(+), 3 deletions(-)

diffs (111 lines):

diff -r 66a7bd59872b -r 9a66c5d4ba1e devel/creduce/Makefile
--- a/devel/creduce/Makefile    Wed Dec 12 11:10:11 2018 +0000
+++ b/devel/creduce/Makefile    Wed Dec 12 12:44:42 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2018/08/22 09:43:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/12 12:44:42 adam Exp $
 
 DISTNAME=      creduce-2.8.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  https://embed.cs.utah.edu/creduce/
 
diff -r 66a7bd59872b -r 9a66c5d4ba1e devel/creduce/distinfo
--- a/devel/creduce/distinfo    Wed Dec 12 11:10:11 2018 +0000
+++ b/devel/creduce/distinfo    Wed Dec 12 12:44:42 2018 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.5 2018/08/07 11:14:20 adam Exp $
+$NetBSD: distinfo,v 1.6 2018/12/12 12:44:42 adam Exp $
 
 SHA1 (creduce-2.8.0.tar.gz) = 4f9ed5c7766f247884ce5c17fa10710372d48d39
 RMD160 (creduce-2.8.0.tar.gz) = fd9ed41cbb8464ee95bc94ec9ccc50b22303bd9a
 SHA512 (creduce-2.8.0.tar.gz) = 9d616dc421d0e932656ab0220ebfe1a4f20a08d46bf4ee004ef96a693ff37caeadf96c769262574a9789ac52c2bb4586e2b8602f7d44b627229b8eb45f5af0ea
 Size (creduce-2.8.0.tar.gz) = 774668 bytes
+SHA1 (patch-clang__delta_ExpressionDetector.cpp) = 62df4dde6d99a015fdc5c59d564ccee52b348fb9
 SHA1 (patch-clang__delta_Makefile.am) = 6eac9443bb954c9fb54a922d6da909cf0a45d25d
 SHA1 (patch-clang__delta_Makefile.in) = c650aab0534268a67615d9360934534ea1d36b90
+SHA1 (patch-clang__delta_RemoveUnusedEnumMember.cpp) = 07c0f213b114ed5ad63d8a97b168f97836c1ea1e
+SHA1 (patch-clang__delta_TransformationManager.cpp) = 8c95efe02d48da0150b08a9624e0fcdb54916bde
diff -r 66a7bd59872b -r 9a66c5d4ba1e devel/creduce/patches/patch-clang__delta_ExpressionDetector.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/creduce/patches/patch-clang__delta_ExpressionDetector.cpp   Wed Dec 12 12:44:42 2018 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-clang__delta_ExpressionDetector.cpp,v 1.1 2018/12/12 12:44:43 adam Exp $
+
+Fix for LLVM 7.0.
+https://github.com/csmith-project/creduce/tree/llvm-7.0
+
+--- clang_delta/ExpressionDetector.cpp.orig    2018-12-12 12:34:31.000000000 +0000
++++ clang_delta/ExpressionDetector.cpp
+@@ -63,7 +63,8 @@ public:
+                           StringRef FileName, bool IsAngled,
+                           CharSourceRange FilenameRange, const FileEntry *File,
+                           StringRef SearchPath, StringRef RelativePath,
+-                          const Module *Imported) override;
++                          const Module *Imported,
++                          SrcMgr::CharacteristicKind FileType) override;
+ 
+ private:
+   SourceManager &SrcManager;
+@@ -83,7 +84,8 @@ void IncludesPPCallbacks::InclusionDirec
+                                             const FileEntry * /*File*/,
+                                             StringRef /*SearchPath*/,
+                                             StringRef /*RelativePath*/,
+-                                            const Module * /*Imported*/)
++                                            const Module * /*Imported*/,
++                                            SrcMgr::CharacteristicKind /*FileType*/)
+ {
+   if (!SrcManager.isInMainFile(HashLoc))
+     return;
diff -r 66a7bd59872b -r 9a66c5d4ba1e devel/creduce/patches/patch-clang__delta_RemoveUnusedEnumMember.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/creduce/patches/patch-clang__delta_RemoveUnusedEnumMember.cpp       Wed Dec 12 12:44:42 2018 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-clang__delta_RemoveUnusedEnumMember.cpp,v 1.1 2018/12/12 12:44:43 adam Exp $
+
+Fix for LLVM 7.0.
+https://github.com/csmith-project/creduce/tree/llvm-7.0
+
+--- clang_delta/RemoveUnusedEnumMember.cpp.orig        2018-12-12 12:36:01.000000000 +0000
++++ clang_delta/RemoveUnusedEnumMember.cpp
+@@ -99,15 +99,15 @@ void RemoveUnusedEnumMember::removeEnumC
+ {
+   SourceLocation StartLoc = (*TheEnumIterator)->getLocStart();
+   if (StartLoc.isMacroID()) {
+-    std::pair<SourceLocation, SourceLocation> Locs =
++    CharSourceRange CSRange =
+       SrcManager->getExpansionRange(StartLoc);
+-    StartLoc = Locs.first;
++    StartLoc = CSRange.getBegin();
+   }
+   SourceLocation EndLoc = (*TheEnumIterator)->getLocEnd();
+   if (EndLoc.isMacroID()) {
+-    std::pair<SourceLocation, SourceLocation> Locs =
++    CharSourceRange CSRange =
+       SrcManager->getExpansionRange(EndLoc);
+-    EndLoc = Locs.second;
++    EndLoc = CSRange.getEnd();
+   }
+   SourceLocation CommaLoc = Lexer::findLocationAfterToken(
+     EndLoc, tok::comma, *SrcManager, Context->getLangOpts(),
diff -r 66a7bd59872b -r 9a66c5d4ba1e devel/creduce/patches/patch-clang__delta_TransformationManager.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/creduce/patches/patch-clang__delta_TransformationManager.cpp        Wed Dec 12 12:44:42 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-clang__delta_TransformationManager.cpp,v 1.4 2018/12/12 12:44:43 adam Exp $
+
+Fix for LLVM 7.0.
+https://github.com/csmith-project/creduce/tree/llvm-7.0
+
+--- clang_delta/TransformationManager.cpp.orig 2018-12-12 12:37:38.000000000 +0000
++++ clang_delta/TransformationManager.cpp
+@@ -223,7 +223,7 @@ llvm::raw_ostream *TransformationManager
+ 
+   std::error_code EC;
+   llvm::raw_fd_ostream *Out = new llvm::raw_fd_ostream(
+-      OutputFileName, EC, llvm::sys::fs::F_RW);
++      OutputFileName, EC, llvm::sys::fs::FA_Read | llvm::sys::fs::FA_Write);
+   assert(!EC && "Cannot open output file!");
+   return Out;
+ }