Merge branch 'master-2.3' into dist/2.3/trusty

Author: sorah

ChangeLog

@@ -4461,7 +4461,7 @@ flatten(VALUE ary, int level, int *modified)
 
     st_free_table(memo);
 
-    RBASIC_SET_CLASS(result, rb_class_of(ary));
+    RBASIC_SET_CLASS(result, rb_obj_class(ary));
     return result;
 }
 

array.c

@@ -6263,7 +6263,7 @@ rb_big_fdiv(VALUE x, VALUE y)
  *
  *    123456789 ** 2      #=> 15241578750190521
  *    123456789 ** 1.2    #=> 5126464716.09932
- *    123456789 ** -2     #=> 6.5610001194102e-17
+ *    123456789 ** -2     #=> (1/15241578750190521)
  */
 
 VALUE
@@ -6804,7 +6804,7 @@ rb_big_aref(VALUE x, VALUE y)
  * See also Object#hash.
  */
 
-static VALUE
+VALUE
 rb_big_hash(VALUE x)
 {
     st_index_t hash;

bignum.c

@@ -201,7 +201,7 @@ configure-ext: $(EXTS_MK)
 
 build-ext: $(EXTS_MK)
 	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
-	    ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
 
 prog: program wprogram
 

common.mk

@@ -252,6 +252,7 @@ r_value(VALUE value)
 #define ADD_TRACE(seq, line, event) \
   do { \
       if ((event) == RUBY_EVENT_LINE && ISEQ_COVERAGE(iseq) && \
+	  (line) > 0 && \
 	  (line) != ISEQ_COMPILE_DATA(iseq)->last_coverable_line) { \
 	  RARRAY_ASET(ISEQ_COVERAGE(iseq), (line) - 1, INT2FIX(0)); \
 	  ISEQ_COMPILE_DATA(iseq)->last_coverable_line = (line); \
@@ -2239,6 +2240,13 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 		  /*case BIN(trace):*/
 		    next = next->next;
 		    break;
+		  case BIN(jump):
+		    /* if cond
+		     *   return tailcall
+		     * end
+		     */
+		    next = get_destination_insn((INSN *)next);
+		    break;
 		  case BIN(leave):
 		    piobj = iobj;
 		  default:

compile.c

@@ -1414,7 +1414,7 @@ rb_complex_set_real(VALUE cmp, VALUE r)
 VALUE
 rb_complex_set_imag(VALUE cmp, VALUE i)
 {
-    RCOMPLEX_SET_REAL(cmp, i);
+    RCOMPLEX_SET_IMAG(cmp, i);
     return cmp;
 }
 

complex.c

@@ -3686,7 +3686,7 @@ AS_CASE("$enable_shared", [yes], [
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	],
     [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS $LDFLAGS_OPTDIR"
+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	if test "$load_relative" = yes; then
 	    libprefix="'\$\${ORIGIN}/../${libdir_basename}'"

configure.in

@@ -476,6 +476,10 @@ cont_new(VALUE klass)
 
 static VALUE
 cont_capture(volatile int *stat)
+#if defined(__clang__) && \
+    __clang_major__ == 3 && __clang_minor__ == 8 && __clang_patch__ == 0
+__attribute__ ((optnone))
+#endif
 {
     rb_context_t *cont;
     rb_thread_t *th = GET_THREAD();

cont.c

@@ -1,3 +1,16 @@
+ruby2.3 (2.3.3-0nkmi1) unstable; urgency=medium
+
+  * new upstream version
+
+ -- Sorah Fukumori <[email protected]>  Tue, 22 Nov 2016 18:23:16 +0000
+
+ruby2.3 (2.3.1-5nkmi6) unstable; urgency=medium
+
+  * honor nocheck flag
+    (porting d7218fd9adb2279c9e4b4f626dfeebaa34830add from debian)
+
+ -- Sorah Fukumori <[email protected]>  Mon, 21 Nov 2016 12:43:54 +0000
+
 ruby2.3 (2.3.1-5nkmi5~trusty) trusty; urgency=medium
 
   * stock libruby2.3 has all default gems

debian/changelog

@@ -65,7 +65,9 @@ override_dh_auto_build-arch:
 	dh_auto_build -- main V=1
 
 override_dh_auto_test-arch:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) TESTS="-v -j 4" V=1 check
+endif
 
 override_dh_auto_install-arch:
 	$(MAKE) update-gems extract-gems