[前][次][番号順一覧][スレッド一覧]

ruby-changes:60704

From: Yusuke <ko1@a...>
Date: Thu, 9 Apr 2020 08:21:05 +0900 (JST)
Subject: [ruby-changes:60704] 8ab4c55e7a (master): include/ruby/3: Skip RUBY3_UNREACHABLE_RETURN for icc

https://git.ruby-lang.org/ruby.git/commit/?id=8ab4c55e7a

From 8ab4c55e7a70f5a5bd041d93f425eeef4a47c01e Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Thu, 9 Apr 2020 08:19:00 +0900
Subject: include/ruby/3: Skip RUBY3_UNREACHABLE_RETURN for icc

I'm unsure why, but it fails on icc.

https://rubyci.org/logs/rubyci.s3.amazonaws.com/icc-x64/ruby-master/log/20200408T220004Z.log.html.gz
```
In file included from ../../.././include/ruby/3/core.h(32),
                 from ../../.././include/ruby/ruby.h(28),
                  from cxxanyargs.cpp(1):
../../.././include/ruby/3/core/rtypeddata.h(163): error: return value type does not match the function type
            RUBY3_UNREACHABLE_RETURN(NULL);
```

diff --git a/include/ruby/3/core/rtypeddata.h b/include/ruby/3/core/rtypeddata.h
index 1627d32..21b0857 100644
--- a/include/ruby/3/core/rtypeddata.h
+++ b/include/ruby/3/core/rtypeddata.h
@@ -160,7 +160,7 @@ RTYPEDDATA_TYPE(VALUE obj) https://github.com/ruby/ruby/blob/trunk/include/ruby/3/core/rtypeddata.h#L160
 #if ! RUBY_NDEBUG
     if (RB_UNLIKELY(! RTYPEDDATA_P(obj))) {
         rb_unexpected_type(obj, RUBY_T_DATA);
-# if ! defined(__sun)
+# if ! defined(__sun) && ! RUBY3_COMPILER_IS(Intel)
         RUBY3_UNREACHABLE_RETURN(NULL);
 # endif
     }
diff --git a/include/ruby/3/memory.h b/include/ruby/3/memory.h
index 18ed1d8..4e9741e 100644
--- a/include/ruby/3/memory.h
+++ b/include/ruby/3/memory.h
@@ -253,7 +253,7 @@ ruby3_size_mul_or_raise(size_t x, size_t y) https://github.com/ruby/ruby/blob/trunk/include/ruby/3/memory.h#L253
     }
     else {
         ruby_malloc_size_overflow(x, y);
-# if ! defined(__sun)
+# if ! defined(__sun) && ! RUBY3_COMPILER_IS(Intel)
         RUBY3_UNREACHABLE_RETURN(0);
 # endif
     }
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]