code cleanup

base/client.jl

@@ -426,11 +426,8 @@ function _start()
  println()
  exit(1)
  end
- if is_interactive
- if have_color
- print(color_normal)
- end
- println()
+ if is_interactive && have_color
+ print(color_normal)
  end
 end
 

src/codegen.cpp

@@ -121,7 +121,7 @@ extern "C" {
 
 #include "builtin_proto.h"
 
-void *__stack_chk_guard = NULL;
+DLLEXPORT void *__stack_chk_guard = NULL;
 
 #if defined(_OS_WINDOWS_) && !defined(_COMPILER_MINGW_)
 void __stack_chk_fail()

src/disasm.cpp

@@ -482,7 +482,7 @@ void jl_dump_function_asm(const char *Fptr, size_t Fsize,
 #ifdef LLVM35
  if (MCIA->evaluateBranch(Inst, Index, insSize, addr))
 #else
- if ((addr = MCIA->evaluateBranch(Inst, Index, insSize)) != -1)
+ if ((addr = MCIA->evaluateBranch(Inst, Index, insSize)) != (uint64_t)-1)
 #endif
  DisInfo.insertAddress(addr);
  }

src/dump.c

@@ -1330,10 +1330,8 @@ DLLEXPORT void jl_save_system_image(const char *fname)
  // save module initialization order
  if (jl_module_init_order != NULL) {
  for(i=0; i < jl_array_len(jl_module_init_order); i++) {
- // NULL out any modules that weren't saved
- jl_value_t *mod = jl_cellref(jl_module_init_order, i);
- (void)mod;
- assert(ptrhash_get(&backref_table, mod) != HT_NOTFOUND);
+ // verify that all these modules were saved
+ assert(ptrhash_get(&backref_table, jl_cellref(jl_module_init_order, i)) != HT_NOTFOUND);
  }
  }
  jl_serialize_value(&f, jl_module_init_order);

src/init.c

@@ -765,13 +765,13 @@ static char *abspath(const char *in)
  }
  }
 #else
- DWORD n = GetFullPathName(in, 0, NULL, C_NULL);
+ DWORD n = GetFullPathName(in, 0, NULL, NULL);
  if (n <= 0) {
  ios_printf(ios_stderr, "fatal error: jl_compileropts.image_file path too long or GetFullPathName failed\n");
  exit(1);
  }
  char *out = (char*)malloc(n);
- DWORD m = GetFullPathName(in, n, out, C_NULL);
+ DWORD m = GetFullPathName(in, n, out, NULL);
  if (n != m + 1) {
  ios_printf(ios_stderr, "fatal error: jl_compileropts.image_file path too long or GetFullPathName failed\n");
  exit(1);
@@ -1096,7 +1096,7 @@ extern void *__stack_chk_guard;
 
 void jl_compile_all(void);
 
-DLLEXPORT int julia_save()
+DLLEXPORT void julia_save()
 {
  const char *build_path = jl_compileropts.build_path;
  if (build_path) {

src/julia.expmap

@@ -1,6 +1,7 @@
 {
  global:
  __asan*;
+ __stack_chk_guard;
  alloc_*w;
  allocobj;
  asprintf;

src/julia.h

@@ -1342,7 +1342,7 @@ extern DLLEXPORT jl_compileropts_t jl_compileropts;
 #define JL_COMPILEROPT_DUMPBITCODE_ON 1
 #define JL_COMPILEROPT_DUMPBITCODE_OFF 2
 
-extern void *__stack_chk_guard;
+DLLEXPORT extern void *__stack_chk_guard;
 #define SET_STACK_CHK_GUARD(a,b,c) do { \
  unsigned char *p = (unsigned char *)&__stack_chk_guard; \
  a = p[sizeof(__stack_chk_guard)-1]; \

src/support/dirpath.h

@@ -10,7 +10,9 @@
 #else
 #define PATHSEPSTRING "/"
 #define PATHLISTSEPSTRING ":"
+#ifndef PATH_MAX // many platforms don't have a max path, we define one anyways
 #define PATH_MAX 1024
 #endif
+#endif
 
 #endif

src/task.c

@@ -233,9 +233,9 @@ static void NORETURN finish_task(jl_task_t *t, jl_value_t *resultval)
 }
 
 #if defined(_OS_WINDOWS_) && !defined(_COMPILER_MINGW_)
-void __declspec(noinline)
+static void __declspec(noinline)
 #else
-void __attribute__((noinline))
+static void __attribute__((noinline))
 #endif
 NORETURN start_task()
 {
@@ -348,16 +348,18 @@ static void ctx_switch(jl_task_t *t, jl_jmp_buf *where)
  asm(" movq %0, %%rsp;\n"
  " xorq %%rbp, %%rbp;\n"
  " push %%rbp;\n" // instead of RSP
- " jmp _start_task" // call stack_task with fake stack frame
- : : "r"(jl_stackbase-0x10) : );
+ " jmp %P1;\n" // call stack_task with fake stack frame
+ " ud2"
+ : : "r"(jl_stackbase-0x10), "i"(start_task) : "memory" );
 #elif defined(_CPU_X86_)
  asm(" movl %0, %%esp;\n"
  " xorl %%ebp, %%ebp;\n"
  " push %%ebp;\n" // instead of ESP
- " jmp _start_task" // call stack_task with fake stack frame
- : : "r"(jl_stackbase-0x10) : );
+ " jmp %P1;\n" // call stack_task with fake stack frame
+ " ud2"
+ : : "r"(jl_stackbase-0x10), "i"(start_task) : "memory" );
 #else
-#error ASM_COPY_STACKS not supported on this platform
+#error ASM_COPY_STACKS not supported on this cpu architecture
 #endif
 #else // ASM_COPY_STACKS
  jl_longjmp(jl_base_ctx, 1);

ui/repl.c

@@ -311,7 +311,7 @@ static int true_main(int argc, char *argv[])
  return iserr;
 }
 
-DLLEXPORT extern int julia_save();
+DLLEXPORT extern void julia_save();
 
 #ifndef _OS_WINDOWS_
 int main(int argc, char *argv[])