compiler warnings: squelch them

JuliaLang · Jul 9, 2018 · 808f266 · 808f266
1 parent 98f1f21
commit 808f266
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -21,6 +21,9 @@ FLAGS := \
 ifneq ($(USEMSVC), 1)
 FLAGS += -Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fvisibility=hidden -fno-common \
 		 -Wpointer-arith -Wundef
+ifeq ($(USEGCC),1) # GCC bug #25509 (void)__attribute__((warn_unused_result))
+FLAGS += -Wno-unused-result
+endif
 override CFLAGS += -Wold-style-definition -Wstrict-prototypes -Wc++-compat
 endif
 

diff --git a/src/dump.c b/src/dump.c
@@ -1834,10 +1834,10 @@ static jl_value_t *jl_deserialize_typemap_entry(jl_serializer_state *s)
         jl_deserialize_struct(s, v, 1);
 #ifndef NDEBUG
         if (te->func.value && jl_typeis(te->func.value, jl_method_instance_type)) {
-            assert((te->func.linfo->max_world == 0 &&
+            assert(((te->func.linfo->max_world == 0 &&
                     te->func.linfo->min_world == 1) ||
-                   (te->func.linfo->max_world >= te->max_world &&
-                    te->func.linfo->min_world <= te->min_world) &&
+                    (te->func.linfo->max_world >= te->max_world &&
+                     te->func.linfo->min_world <= te->min_world)) &&
                    "corrupt typemap entry structure");
         }
 #endif

diff --git a/src/intrinsics.cpp b/src/intrinsics.cpp
@@ -1325,15 +1325,5 @@ static Function *boxfunc_llvm(FunctionType *ft, const std::string &cname,
 
 static FunctionType *ft1arg(Type *ret, Type *arg)
 {
-    std::vector<Type*> args1(0);
-    args1.push_back(arg);
-    return FunctionType::get(ret, args1, false);
-}
-
-static FunctionType *ft2arg(Type *ret, Type *arg1, Type *arg2)
-{
-    std::vector<Type*> args2(0);
-    args2.push_back(arg1);
-    args2.push_back(arg2);
-    return FunctionType::get(ret, args2, false);
+    return FunctionType::get(ret, { arg }, false);
 }
diff --git a/src/jloptions.c b/src/jloptions.c
@@ -31,12 +31,12 @@ jl_options_t jl_options = { 0,    // quiet
                             -1,   // banner
                             NULL, // julia_bindir
                             NULL, // julia_bin
-                            NULL, // project
                             NULL, // cmds
                             NULL, // image_file (will be filled in below)
                             NULL, // cpu_target ("native", "core2", etc...)
                             0,    // nprocs
                             NULL, // machine_file
+                            NULL, // project
                             0,    // isinteractive
                             0,    // color
                             JL_OPTIONS_HISTORYFILE_ON, // history file