Skip to content

Commit a6c8e8d

Browse files
committed
* configure.in: add -Wsuggest-attribute=noreturn and suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 644c36e commit a6c8e8d

File tree

8 files changed

+26
-18
lines changed

8 files changed

+26
-18
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Sun May 8 08:31:03 2016 NARUSE, Yui <naruse@ruby-lang.org>
2+
3+
* configure.in: add -Wsuggest-attribute=noreturn and suppress warnings.
4+
15
Sun May 8 08:19:16 2016 NARUSE, Yui <naruse@ruby-lang.org>
26

37
* configure.in: add -Werror=implicit-int to avoid missing type of

configure.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,7 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
835835
-Werror=division-by-zero \
836836
-Werror=deprecated-declarations \
837837
-Wno-packed-bitfield-compat \
838+
-Wsuggest-attribute=noreturn \
838839
$extra_warning \
839840
; do
840841
if test "$particular_werror_flags" != yes; then

dmydln.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "ruby/ruby.h"
22

3+
NORETURN(void *dln_load(const char *));
34
void*
45
dln_load(const char *file)
56
{

include/ruby/intern.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@ PRINTF_ARGS(NORETURN(void rb_loaderror_with_path(VALUE path, const char*, ...)),
249249
PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
250250
PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3);
251251
NORETURN(void rb_invalid_str(const char*, const char*));
252-
DEPRECATED(PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4));
253-
DEPRECATED(PRINTF_ARGS(void rb_compile_error_with_enc(const char*, int, void *, const char*, ...), 4, 5));
254-
DEPRECATED(PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2));
252+
NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4)));
253+
NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_with_enc(const char*, int, void *, const char*, ...), 4, 5)));
254+
NORETURN(DEPRECATED(PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2)));
255255
NORETURN(void rb_error_frozen(const char*));
256256
NORETURN(void rb_error_frozen_object(VALUE));
257257
void rb_error_untrusted(VALUE);
@@ -367,12 +367,12 @@ typedef fd_set rb_fdset_t;
367367

368368
NORETURN(void rb_exc_raise(VALUE));
369369
NORETURN(void rb_exc_fatal(VALUE));
370-
VALUE rb_f_exit(int, const VALUE*);
371-
VALUE rb_f_abort(int, const VALUE*);
370+
NORETURN(VALUE rb_f_exit(int, const VALUE*));
371+
NORETURN(VALUE rb_f_abort(int, const VALUE*));
372372
void rb_remove_method(VALUE, const char*);
373373
void rb_remove_method_id(VALUE, ID);
374-
DEPRECATED(static inline void rb_disable_super(void));
375-
DEPRECATED(static inline void rb_enable_super(void));
374+
NORETURN(DEPRECATED(static inline void rb_disable_super(void)));
375+
NORETURN(DEPRECATED(static inline void rb_enable_super(void)));
376376
static inline void rb_disable_super(void)
377377
{
378378
/* obsolete - no use */
@@ -388,7 +388,7 @@ typedef VALUE (*rb_alloc_func_t)(VALUE);
388388
void rb_define_alloc_func(VALUE, rb_alloc_func_t);
389389
void rb_undef_alloc_func(VALUE);
390390
rb_alloc_func_t rb_get_alloc_func(VALUE);
391-
DEPRECATED(void rb_clear_cache(void));
391+
NORETURN(DEPRECATED(void rb_clear_cache(void)));
392392
void rb_clear_constant_cache(void);
393393
void rb_clear_method_cache_by_class(VALUE);
394394
void rb_alias(VALUE, ID, ID);
@@ -398,12 +398,12 @@ int rb_method_basic_definition_p(VALUE, ID);
398398
VALUE rb_eval_cmd(VALUE, VALUE, int);
399399
int rb_obj_respond_to(VALUE, ID, int);
400400
int rb_respond_to(VALUE, ID);
401-
VALUE rb_f_notimplement(int argc, const VALUE *argv, VALUE obj);
401+
NORETURN(VALUE rb_f_notimplement(int argc, const VALUE *argv, VALUE obj));
402402
#if !defined(RUBY_EXPORT) && defined(_WIN32)
403403
RUBY_EXTERN VALUE (*const rb_f_notimplement_)(int, const VALUE *, VALUE);
404404
#define rb_f_notimplement (*rb_f_notimplement_)
405405
#endif
406-
void rb_interrupt(void);
406+
NORETURN(void rb_interrupt(void));
407407
VALUE rb_apply(VALUE, ID, VALUE);
408408
void rb_backtrace(void);
409409
ID rb_frame_this_func(void);
@@ -638,7 +638,7 @@ void rb_lastline_set(VALUE);
638638
void rb_last_status_set(int status, rb_pid_t pid);
639639
VALUE rb_last_status_get(void);
640640
int rb_proc_exec(const char*);
641-
VALUE rb_f_exec(int, const VALUE*);
641+
NORETURN(VALUE rb_f_exec(int, const VALUE*));
642642
rb_pid_t rb_waitpid(rb_pid_t pid, int *status, int flags);
643643
void rb_syswait(rb_pid_t pid);
644644
rb_pid_t rb_spawn(int, const VALUE*);
@@ -776,8 +776,8 @@ VALUE rb_str_replace(VALUE, VALUE);
776776
VALUE rb_str_inspect(VALUE);
777777
VALUE rb_str_dump(VALUE);
778778
VALUE rb_str_split(VALUE, const char*);
779-
DEPRECATED(void rb_str_associate(VALUE, VALUE));
780-
DEPRECATED(VALUE rb_str_associated(VALUE));
779+
NORETURN(DEPRECATED(void rb_str_associate(VALUE, VALUE)));
780+
NORETURN(DEPRECATED(VALUE rb_str_associated(VALUE)));
781781
void rb_str_setter(VALUE, ID, VALUE*);
782782
VALUE rb_str_intern(VALUE);
783783
VALUE rb_sym_to_s(VALUE);
@@ -965,7 +965,7 @@ VALUE rb_const_get_at(VALUE, ID);
965965
VALUE rb_const_get_from(VALUE, ID);
966966
void rb_const_set(VALUE, ID, VALUE);
967967
VALUE rb_const_remove(VALUE, ID);
968-
VALUE rb_mod_const_missing(VALUE,VALUE);
968+
NORETURN(VALUE rb_mod_const_missing(VALUE,VALUE));
969969
VALUE rb_cvar_defined(VALUE, ID);
970970
void rb_cvar_set(VALUE, ID, VALUE);
971971
VALUE rb_cvar_get(VALUE, ID);
@@ -983,7 +983,7 @@ VALUE rb_make_backtrace(void);
983983
VALUE rb_make_exception(int, const VALUE*);
984984

985985
/* deprecated */
986-
DEPRECATED(void rb_frame_pop(void));
986+
NORETURN(DEPRECATED(void rb_frame_pop(void)));
987987

988988

989989
RUBY_SYMBOL_EXPORT_END

include/ruby/ruby.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1715,7 +1715,7 @@ VALUE rb_gvar_var_getter(ID id, void *data, struct rb_global_variable *gvar);
17151715
void rb_gvar_var_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
17161716
void rb_gvar_var_marker(VALUE *var);
17171717

1718-
void rb_gvar_readonly_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar);
1718+
NORETURN(void rb_gvar_readonly_setter(VALUE val, ID id, void *data, struct rb_global_variable *gvar));
17191719

17201720
void rb_define_variable(const char*,VALUE*);
17211721
void rb_define_virtual_variable(const char*,VALUE(*)(ANYARGS),void(*)(ANYARGS));

numeric.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2684,7 +2684,8 @@ rb_fix2int(VALUE val)
26842684
}
26852685
#endif
26862686

2687-
void
2687+
NORETURN(static void rb_out_of_short(SIGNED_VALUE num));
2688+
static void
26882689
rb_out_of_short(SIGNED_VALUE num)
26892690
{
26902691
rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to `short'",

process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2584,7 +2584,7 @@ rb_f_exec(int argc, const VALUE *argv)
25842584
rb_exec_fail(eargp, err, errmsg);
25852585
RB_GC_GUARD(execarg_obj);
25862586
rb_syserr_fail_str(err, fail_str);
2587-
return Qnil; /* dummy */
2587+
UNREACHABLE;
25882588
}
25892589

25902590
#define ERRMSG(str) do { if (errmsg && 0 < errmsg_buflen) strlcpy(errmsg, (str), errmsg_buflen); } while (0)

thread.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2117,6 +2117,7 @@ rb_threadptr_signal_exit(rb_thread_t *th)
21172117
#define USE_SIGALTSTACK
21182118
#endif
21192119

2120+
NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
21202121
void
21212122
ruby_thread_stack_overflow(rb_thread_t *th)
21222123
{

0 commit comments

Comments
 (0)