fix #922

Author: JeffBezanson

src/cgutils.cpp

@@ -581,7 +581,8 @@ static Value *emit_array_nd_index(Value *a, size_t nd, jl_value_t **args,
 
     ctx->f->getBasicBlockList().push_back(failBB);
     builder.SetInsertPoint(failBB);
-    builder.CreateCall(jlraise_func, builder.CreateLoad(jlboundserr_var));
+    builder.CreateCall2(jlraise_line_func, builder.CreateLoad(jlboundserr_var),
+                        ConstantInt::get(T_int32, ctx->lineno));
     builder.CreateUnreachable();
 
     ctx->f->getBasicBlockList().push_back(endBB);

src/codegen.cpp

@@ -108,6 +108,7 @@ static GlobalVariable *jlboundserr_var;
 // important functions
 static Function *jlnew_func;
 static Function *jlraise_func;
+static Function *jlraise_line_func;
 static Function *jlerror_func;
 static Function *jltypeerror_func;
 static Function *jlcheckassign_func;
@@ -331,6 +332,7 @@ typedef struct {
     jl_sym_t *vaName;  // name of vararg argument
     bool vaStack;      // varargs stack-allocated
     int nReqArgs;
+    int lineno;
 } jl_codectx_t;
 
 static Value *emit_expr(jl_value_t *expr, jl_codectx_t *ctx, bool boxed=true,
@@ -1913,6 +1915,7 @@ static Function *emit_function(jl_lambda_info_t *lam)
             filename = ((jl_sym_t*)jl_exprarg(stmt, 1))->name;
         }
     }
+    ctx.lineno = lno;
 
     // TODO: Fix when moving to new LLVM version
     dbuilder->createCompileUnit(0x01, filename, ".", "julia", true, "", 0); 
@@ -2213,10 +2216,12 @@ static Function *emit_function(jl_lambda_info_t *lam)
         if (jl_is_linenode(stmt)) {
             int lno = jl_linenode_line(stmt);
             builder.SetCurrentDebugLocation(DebugLoc::get(lno, 1, (MDNode*)SP, NULL));
+            ctx.lineno = lno;
         }
         else if (jl_is_expr(stmt) && ((jl_expr_t*)stmt)->head == line_sym) {
             int lno = jl_unbox_long(jl_exprarg(stmt, 0));
             builder.SetCurrentDebugLocation(DebugLoc::get(lno, 1, (MDNode*)SP, NULL));
+            ctx.lineno = lno;
         }
         if (jl_is_labelnode(stmt)) {
             if (prevlabel) continue;
@@ -2430,6 +2435,14 @@ static void init_julia_llvm_env(Module *m)
     jlraise_func->setDoesNotReturn();
     jl_ExecutionEngine->addGlobalMapping(jlraise_func, (void*)&jl_raise);
 
+    std::vector<Type*> args2_raise(0);
+    args2_raise.push_back(jl_pvalue_llvmt);
+    args2_raise.push_back(T_int32);
+    jlraise_line_func =
+        (Function*)jl_Module->getOrInsertFunction("jl_raise_with_superfluous_argument",
+                                                  FunctionType::get(T_void, args2_raise, false));
+    jlraise_line_func->setDoesNotReturn();
+
     jlnew_func =
         Function::Create(FunctionType::get(jl_pvalue_llvmt, args1_, false),
                          Function::ExternalLinkage,

src/julia.expmap

@@ -168,6 +168,8 @@
     jl_ptr_to_array_1d;
     jl_readdir;
     jl_readuntil;
+    jl_raise;
+    jl_raise_with_superfluous_argument;
     jl_register_toplevel_eh;
     jl_reshape_array;
     jl_restore_system_image;

src/task.c

@@ -555,6 +555,11 @@ void jl_raise(jl_value_t *e)
     jl_exit(1);
 }
 
+DLLEXPORT void jl_raise_with_superfluous_argument(jl_value_t *e, int line)
+{
+    jl_raise(e);
+}
+
 jl_task_t *jl_new_task(jl_function_t *start, size_t ssize)
 {
     size_t pagesz = jl_page_size;