Merge pull request #32096 from JuliaLang/kf/samisc

Misc static analyzer nits

src/ccall.cpp

@@ -87,7 +87,7 @@ static bool runtime_sym_gvs(const char *f_lib, const char *f_name, MT &&M,
             symMap = &libgv.second;
             libsym = jl_get_library(f_lib);
             assert(libsym != NULL);
-            *(void**)jl_emit_and_add_to_shadow(libptrgv) = libsym;
+            *jl_emit_and_add_to_shadow(libptrgv) = libsym;
         }
         else {
             libptrgv = iter->second.first;
@@ -116,7 +116,7 @@ static bool runtime_sym_gvs(const char *f_lib, const char *f_name, MT &&M,
         (*symMap)[f_name] = std::make_pair(llvmgv, addr);
         if (symaddr)
             *symaddr = addr;
-        *(void**)jl_emit_and_add_to_shadow(llvmgv) = addr;
+        *jl_emit_and_add_to_shadow(llvmgv) = addr;
     }
     else {
         if (symaddr)
@@ -238,7 +238,7 @@ static GlobalVariable *emit_plt_thunk(
     GlobalVariable *got = new GlobalVariable(*M, T_pvoidfunc, false,
                                              GlobalVariable::ExternalLinkage,
                                              nullptr, gname);
-    *(void**)jl_emit_and_add_to_shadow(got) = symaddr;
+    *jl_emit_and_add_to_shadow(got) = symaddr;
     BasicBlock *b0 = BasicBlock::Create(jl_LLVMContext, "top", plt);
     IRBuilder<> irbuilder(b0);
     Value *ptr = runtime_sym_lookup(irbuilder, funcptype, f_lib, f_name, plt, libptrgv,
@@ -1426,7 +1426,9 @@ static jl_cgval_t emit_ccall(jl_codectx_t &ctx, jl_value_t **args, size_t nargs)
     // method involving `jl_dlsym()` on Linux platforms instead.
 #ifdef _OS_LINUX_
         jl_ptls_t (*p)(void);
-        jl_dlsym(jl_dlopen(nullptr, 0), "jl_get_ptls_states", (void **)&p, 0);
+        void *handle = jl_dlopen(nullptr, 0);
+        jl_dlsym(handle, "jl_get_ptls_states", (void **)&p, 0);
+        jl_dlclose(handle);
         return p;
 #else
         return &jl_get_ptls_states;

src/cgmemmgr.cpp

@@ -96,9 +96,10 @@ static bool check_fd_or_close(int fd)
 {
     if (fd == -1)
         return false;
-    fcntl(fd, F_SETFD, FD_CLOEXEC);
-    fchmod(fd, S_IRWXU);
-    if (ftruncate(fd, jl_page_size) != 0) {
+    int err = fcntl(fd, F_SETFD, FD_CLOEXEC);
+    assert(err == 0);
+    if (fchmod(fd, S_IRWXU) != 0 ||
+        ftruncate(fd, jl_page_size) != 0) {
         close(fd);
         return false;
     }

src/codegen.cpp

@@ -1101,11 +1101,7 @@ jl_code_instance_t *jl_compile_linfo(jl_method_instance_t *mi, jl_code_info_t *s
                     if (codeinst->min_world <= world && world <= codeinst->max_world) {
                         jl_llvm_functions_t decls = codeinst->functionObjectsDecls;
                         bool already_compiled = params->cached && decls.functionObject != NULL;
-                        if (!src) {
-                            if (already_compiled || codeinst->invoke == jl_fptr_const_return)
-                                goto locked_out;
-                        }
-                        else if (already_compiled) {
+                        if (already_compiled) {
                             goto locked_out;
                         }
                     }
@@ -1634,6 +1630,7 @@ void *jl_get_llvmf_decl(jl_method_instance_t *mi, size_t world, bool getwrapper,
             return returninfo.decl;
         }
     }
+    assert(decls.functionObject);
     auto f = Function::Create(jl_func_sig, GlobalVariable::ExternalLinkage, decls.functionObject);
     add_return_attr(f, Attribute::NonNull);
     f->addFnAttr(Thunk);

src/datatype.c

@@ -852,6 +852,8 @@ JL_DLLEXPORT jl_value_t *jl_new_structt(jl_datatype_t *type, jl_value_t *tup)
     jl_ptls_t ptls = jl_get_ptls_states();
     if (!jl_is_tuple(tup))
         jl_type_error("new", (jl_value_t*)jl_tuple_type, tup);
+    if (type->layout == NULL)
+        jl_type_error("new", (jl_value_t *)jl_datatype_type, (jl_value_t *)type);
     size_t nargs = jl_nfields(tup);
     size_t nf = jl_datatype_nfields(type);
     JL_NARGS(new, nf, nf);
@@ -866,8 +868,6 @@ JL_DLLEXPORT jl_value_t *jl_new_structt(jl_datatype_t *type, jl_value_t *tup)
         }
         return type->instance;
     }
-    if (type->layout == NULL)
-        jl_type_error("new", (jl_value_t*)jl_datatype_type, (jl_value_t*)type);
     jl_value_t *jv = jl_gc_alloc(ptls, jl_datatype_size(type), type);
     jl_value_t *fi = NULL;
     JL_GC_PUSH2(&jv, &fi);

src/dump.c

@@ -2605,7 +2605,7 @@ JL_DLLEXPORT jl_code_info_t *jl_uncompress_ast(jl_method_t *m, jl_code_instance_
     jl_value_t *slotnames = jl_deserialize_value(&s, NULL);
     if (!jl_is_string(slotnames))
         slotnames = m->slot_syms;
-    code->slotnames = jl_uncompress_argnames(m->slot_syms);
+    code->slotnames = jl_uncompress_argnames(slotnames);
 
     size_t nstmt = jl_array_len(code->code);
     code->codelocs = (jl_value_t*)jl_alloc_array_1d(jl_array_int32_type, nstmt);
@@ -3072,6 +3072,7 @@ static jl_method_t *jl_lookup_method_worldset(jl_methtable_t *mt, jl_datatype_t
     while (1) {
         entry = jl_typemap_assoc_by_type(
             mt->defs, (jl_value_t*)sig, NULL, /*subtype*/0, /*offs*/0, world, /*max_world_mask*/(~(size_t)0) >> 1);
+        assert(entry);
         jl_method_t *_new = (jl_method_t*)entry->func.value;
         world = lowerbound_dependent_world_set(_new->primary_world, dependent_worlds);
         if (world == _new->primary_world) {

src/init.c

@@ -397,6 +397,7 @@ static void *init_stdio_handle(const char *stdio, uv_os_fd_t fd, int readable)
         {
             int nullfd;
             nullfd = open("/dev/null", O_RDWR, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH /* 0666 */);
+            assert(nullfd != -1);
             dup2(nullfd, fd);
             close(nullfd);
         }

src/interpreter.c

@@ -835,17 +835,13 @@ SECT_INTERP CALLBACK_ABI void *jl_interpret_call_callback(interpreter_state *s,
     locals[1] = (jl_value_t*)stmts;
     s->locals = locals + 2;
     s->src = src;
-    size_t nargs;
-    int isva;
     if (jl_is_module(args->mi->def.value)) {
         s->module = args->mi->def.module;
-        nargs = 0;
-        isva = 0;
     }
     else {
         s->module = args->mi->def.method->module;
-        nargs = args->mi->def.method->nargs;
-        isva = args->mi->def.method->isva ? 1 : 0;
+        size_t nargs = args->mi->def.method->nargs;
+        int isva = args->mi->def.method->isva ? 1 : 0;
         size_t i;
         s->locals[0] = args->f;
         for (i = 1; i < nargs - isva; i++)

src/jitlayers.cpp

@@ -433,9 +433,9 @@ JuliaOJIT::JuliaOJIT(TargetMachine &TM)
     // Make sure SectionMemoryManager::getSymbolAddressInProcess can resolve
     // symbols in the program as well. The nullptr argument to the function
     // tells DynamicLibrary to load the program, not a library.
-    std::string *ErrorStr = nullptr;
-    if (sys::DynamicLibrary::LoadLibraryPermanently(nullptr, ErrorStr))
-        report_fatal_error("FATAL: unable to dlopen self\n" + *ErrorStr);
+    std::string ErrorStr;
+    if (sys::DynamicLibrary::LoadLibraryPermanently(nullptr, &ErrorStr))
+        report_fatal_error("FATAL: unable to dlopen self\n" + ErrorStr);
 }
 
 void JuliaOJIT::addGlobalMapping(StringRef Name, uint64_t Addr)
@@ -873,7 +873,7 @@ static std::map<void*, jl_value_llvm> jl_value_to_llvm;
 //
 // then add a global mapping to the current value (usually from calloc'd space)
 // to the execution engine to make it valid for the current session (with the current value)
-void* jl_emit_and_add_to_shadow(GlobalVariable *gv, void *gvarinit)
+void** jl_emit_and_add_to_shadow(GlobalVariable *gv, void *gvarinit)
 {
     PointerType *T = cast<PointerType>(gv->getType()->getElementType()); // pointer is the only supported type here
 
@@ -896,7 +896,7 @@ void* jl_emit_and_add_to_shadow(GlobalVariable *gv, void *gvarinit)
     }
 
     // make the pointer valid for this session
-    void *slot = calloc(1, sizeof(void*));
+    void **slot = (void**)calloc(1, sizeof(void*));
     jl_ExecutionEngine->addGlobalMapping(gv, slot);
     return slot;
 }
@@ -1150,7 +1150,7 @@ GlobalVariable *jl_get_global_for(const char *cname, void *addr, Module *M)
     GlobalVariable *gv = new GlobalVariable(*M, T_pjlvalue,
                            false, GlobalVariable::ExternalLinkage,
                            NULL, gvname.str());
-    *(void**)jl_emit_and_add_to_shadow(gv, addr) = addr;
+    *jl_emit_and_add_to_shadow(gv, addr) = addr;
     return gv;
 }
 

src/jitlayers.h

@@ -38,7 +38,7 @@ typedef struct {Value *gv; int32_t index;} jl_value_llvm; // uses 1-based indexi
 
 void addTargetPasses(legacy::PassManagerBase *PM, TargetMachine *TM);
 void addOptimizationPasses(legacy::PassManagerBase *PM, int opt_level, bool lower_intrinsics=true, bool dump_native=false);
-void* jl_emit_and_add_to_shadow(GlobalVariable *gv, void *gvarinit = NULL);
+void** jl_emit_and_add_to_shadow(GlobalVariable *gv, void *gvarinit = NULL);
 void* jl_get_globalvar(GlobalVariable *gv);
 GlobalVariable *jl_get_global_for(const char *cname, void *addr, Module *M);
 void jl_add_to_shadow(Module *m);

src/runtime_ccall.cpp

@@ -272,7 +272,7 @@ jl_value_t *jl_get_cfunction_trampoline(
 
     // not found, allocate a new one
     size_t n = jl_svec_len(fill);
-    void **nval = (void**)malloc(sizeof(void**) * (n + 1));
+    void **nval = (void**)malloc(sizeof(void*) * (n + 1));
     nval[0] = (void*)fobj;
     jl_value_t *result;
     JL_TRY {

src/staticdata.c

@@ -985,7 +985,7 @@ static inline uintptr_t get_item_for_reloc(jl_serializer_state *s, uintptr_t bas
         offset -= NBOX_C;
         if (offset < 256)
             return (uintptr_t)jl_box_uint8(offset);
-        offset -= 256;
+        // offset -= 256;
         assert(0 && "corrupt relocation item id");
     case BuiltinFunctionRef:
         assert(offset < sizeof(id_to_fptrs) / sizeof(*id_to_fptrs) && "unknown function pointer ID");

src/subtype.c

@@ -1869,14 +1869,16 @@ static int subtype_in_env_existential(jl_value_t *x, jl_value_t *y, jl_stenv_t *
     int8_t *rs = (int8_t*)malloc(len);
     int n = 0;
     v = e->vars;
-    while (v != NULL) {
+    while (n < len) {
+        assert(v != NULL);
         rs[n++] = v->right;
         v->right = 1;
         v = v->prev;
     }
     int issub = subtype_in_env(x, y, e);
     n = 0; v = e->vars;
-    while (v != NULL) {
+    while (n < len) {
+        assert(v != NULL);
         v->right = rs[n++];
         v = v->prev;
     }

src/sys.c

@@ -493,7 +493,9 @@ JL_DLLEXPORT long jl_getpagesize(void)
 #else
 JL_DLLEXPORT long jl_getpagesize(void)
 {
-    return sysconf(_SC_PAGESIZE);
+    long page_size = sysconf(_SC_PAGESIZE);
+    assert(page_size != -1);
+    return page_size;
 }
 #endif
 

src/task.c

@@ -384,6 +384,8 @@ JL_DLLEXPORT void jl_switchto(jl_task_t **pt)
     assert(blk == ct->timing_stack);
     if (blk)
         jl_timing_block_start(blk);
+#else
+    (void)ct;
 #endif
 
     jl_gc_unsafe_leave(ptls, gc_state);