# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1522846348 14400
# Node ID 9fcbd5949271d00970f2eefb7270bb1e5fb2fbcb
# Parent  d7239105c409d3085152579d97e24ce3cfb6bc3f# Parent  98596e4522bcf7f269709fdbadcce2458f3233ab
maint: Merge stable to default.

diff -r d7239105c409 -r 9fcbd5949271 libinterp/parse-tree/pt-jit.cc
--- a/libinterp/parse-tree/pt-jit.cc	Wed Apr 04 08:34:19 2018 -0400
+++ b/libinterp/parse-tree/pt-jit.cc	Wed Apr 04 08:52:28 2018 -0400
@@ -67,8 +67,10 @@
 
 #include <llvm/Bitcode/ReaderWriter.h>
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
-// #include <llvm/ExecutionEngine/JIT.h>  // old JIT, LLVM < 3.6.0
-#include <llvm/ExecutionEngine/MCJIT.h>   // MCJIT, LLVM >= 3.0.0
+// old JIT, LLVM < 3.6.0
+// #include <llvm/ExecutionEngine/JIT.h>
+// MCJIT, LLVM >= 3.0.0
+#include <llvm/ExecutionEngine/MCJIT.h>
 #include "llvm/ExecutionEngine/SectionMemoryManager.h"
 
 #if defined (LEGACY_PASSMANAGER)
@@ -1360,8 +1362,10 @@
 
         for (size_t i = 0; i < m_argument_vec.size (); ++i)
           {
-            // llvm::Value *loaded_arg = builder.CreateConstInBoundsGEP1_32 (arg, i);         // LLVM <= 3.6
-            llvm::Value *loaded_arg = builder.CreateConstInBoundsGEP1_32 (arg_type, arg, i);  // LLVM >= 3.7
+            // LLVM <= 3.6
+            // llvm::Value *loaded_arg = builder.CreateConstInBoundsGEP1_32 (arg, i);
+            // LLVM >= 3.7
+            llvm::Value *loaded_arg = builder.CreateConstInBoundsGEP1_32 (arg_type, arg, i);
 
             m_arguments[m_argument_vec[i].first] = loaded_arg;
           }
@@ -2559,7 +2563,7 @@
             llvm::Value *arg;
             // LLVM <= 3.6
             // arg = builder.CreateConstInBoundsGEP1_32 (wrapper_arg, i);
-            / / LLVM >= 3.7
+            // LLVM >= 3.7
             arg = builder.CreateConstInBoundsGEP1_32 (any_t->to_llvm (),
                                                       wrapper_arg, i);