expand allowd cmdline args

Author: IanButterworth

base/util.jl

@@ -245,7 +245,7 @@ function julia_cmd(julia=joinpath(Sys.BINDIR, julia_exename()); cpu_target::Unio
         push!(addflags, "--pkgimages=no")
     else
         # If pkgimage is set, malloc_log and code_coverage should not
-        @assert opts.malloc_log == 0 && opts.code_coverage == 0
+        @assert opts.malloc_log in (0, 3) && opts.code_coverage in (0, 3)
     end
     return `$julia -C$cpu_target -J$image_file $addflags`
 end

src/init.c

@@ -804,7 +804,8 @@ JL_DLLEXPORT void julia_init(JL_IMAGE_SEARCH rel)
 #endif
 
     if ((jl_options.outputo || jl_options.outputbc || jl_options.outputasm) &&
-        (jl_options.code_coverage || jl_options.malloc_log)) {
+        (jl_options.code_coverage == 1 || jl_options.code_coverage == 2 || 
+         jl_options.malloc_log == 1 || jl_options.malloc_log == 2)) {
         jl_error("cannot generate code-coverage or track allocation information while generating a .o, .bc, or .s output file");
     }
 

src/jloptions.c

@@ -860,10 +860,17 @@ JL_DLLEXPORT void jl_parse_opts(int *argcp, char ***argvp)
                       "This is a bug, please report it.", c);
         }
     }
-    if (codecov || malloclog) {
+    if (codecov == 1 || codecov == 2) {
         if (pkgimage_explicit && jl_options.use_pkgimages) {
             jl_errorf("julia: Can't use --pkgimages=yes together "
-                      "with --track-allocation or --code-coverage.");
+                      "with --code-coverage=user|all");
+        }
+        jl_options.use_pkgimages = 0;
+    }
+    if (malloclog == 1 || malloclog == 2) {
+        if (pkgimage_explicit && jl_options.use_pkgimages) {
+            jl_errorf("julia: Can't use --pkgimages=yes together "
+                      "with --track-allocation=user|all");
         }
         jl_options.use_pkgimages = 0;
     }