llvm-all-in-one: Update to SVN r. 314651

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Oct 2 17:58:27 2017 +0200
Changeset:	1f33760e660c083ac389a8dda6ffc8509d1395f6

Modified Files:
	llvm-all-in-one/Makefile
	llvm-all-in-one/distinfo
	llvm-all-in-one/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h

Log Message:
llvm-all-in-one: Update to SVN r. 314651

Rediff local patch for Orc JIT.

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f33760e660c083ac389a8dda6ffc8509d1395f6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 llvm-all-in-one/Makefile                              |  2 +-
 llvm-all-in-one/distinfo                              |  2 +-
 ...nclude_llvm_ExecutionEngine_Orc_IndirectionUtils.h | 19 ++++++-------------
 3 files changed, 8 insertions(+), 15 deletions(-)

diffs:
diff --git a/llvm-all-in-one/Makefile b/llvm-all-in-one/Makefile
index d1c109699d..c1043fd08d 100644
--- a/llvm-all-in-one/Makefile
+++ b/llvm-all-in-one/Makefile
@@ -4,7 +4,7 @@ LLVM_VERSION=	6.0.0
 
 CATEGORIES=	lang devel
 
-LLVM_SVN_REV=		312394
+LLVM_SVN_REV=		314651
 
 SVN_REPOSITORIES=		llvm
 SVN_REPO.llvm=			http://llvm.org/svn/llvm-project/llvm/trunk
diff --git a/llvm-all-in-one/distinfo b/llvm-all-in-one/distinfo
index 0dfcb0a710..ad6e2d13d6 100644
--- a/llvm-all-in-one/distinfo
+++ b/llvm-all-in-one/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h) = 7aa55e13e78ed6a4a80520ffada33016ec27a711
+SHA1 (patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h) = 22060ef02e83a7ea9cada158866910d0bb782fcf
 SHA1 (patch-include_llvm_ExecutionEngine_Orc_OrcRemoteTargetServer.h) = e2f96f49e1d5afa1e1cbc3cfc98a81b19f0ce230
 SHA1 (patch-lib_ExecutionEngine_Orc_OrcABISupport.cpp) = b24a57af1c6fea12f0dd252ccfd23ce6945f307d
 SHA1 (patch-lib_ExecutionEngine_SectionMemoryManager.cpp) = f3498378be67171ad4d1a211f6172d5f2f8248f7
diff --git a/llvm-all-in-one/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h b/llvm-all-in-one/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h
index 4dffecc3bc..81e625588e 100644
--- a/llvm-all-in-one/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h
+++ b/llvm-all-in-one/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- include/llvm/ExecutionEngine/Orc/IndirectionUtils.h.orig	2017-07-05 18:41:32.000000000 +0000
+--- include/llvm/ExecutionEngine/Orc/IndirectionUtils.h.orig	2017-10-02 15:23:26.164151727 +0000
 +++ include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
-@@ -164,15 +164,16 @@ public:
+@@ -168,15 +168,16 @@ public:
    LocalJITCompileCallbackManager(JITTargetAddress ErrorHandlerAddress)
        : JITCompileCallbackManager(ErrorHandlerAddress) {
      /// Set up the resolver block.
@@ -24,8 +24,8 @@ $NetBSD$
      EC = sys::Memory::protectMappedMemory(ResolverBlock.getMemoryBlock(),
                                            sys::Memory::MF_READ |
                                                sys::Memory::MF_EXEC);
-@@ -191,12 +192,11 @@ private:
-   void grow() override {
+@@ -195,13 +196,11 @@ private:
+   Error grow() override {
      assert(this->AvailableTrampolines.empty() && "Growing prematurely?");
  
 -    std::error_code EC;
@@ -33,7 +33,8 @@ $NetBSD$
 -        sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
 -            sys::Process::getPageSize(), nullptr,
 -            sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
--    assert(!EC && "Failed to allocate trampoline block");
+-    if (EC)
+-      return errorCodeToError(EC);
 +    std::string Err;
 +    auto TrampolineBlock = sys::OwningMemoryBlock(
 +        sys::Memory::AllocateRWX(sys::Process::getPageSize(), nullptr, &Err));
@@ -42,11 +43,3 @@ $NetBSD$
  
      unsigned NumTrampolines =
          (sys::Process::getPageSize() - TargetT::PointerSize) /
-@@ -211,6 +211,7 @@ private:
-           static_cast<JITTargetAddress>(reinterpret_cast<uintptr_t>(
-               TrampolineMem + (I * TargetT::TrampolineSize))));
- 
-+    std::error_code EC;
-     EC = sys::Memory::protectMappedMemory(TrampolineBlock.getMemoryBlock(),
-                                           sys::Memory::MF_READ |
-                                               sys::Memory::MF_EXEC);