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

ruby-changes:60479

From: Takashi <ko1@a...>
Date: Mon, 23 Mar 2020 07:50:28 +0900 (JST)
Subject: [ruby-changes:60479] 3cf3427c99 (master): Try asserting no static decl rather than warning

https://git.ruby-lang.org/ruby.git/commit/?id=3cf3427c99

From 3cf3427c991eb621cb670e24331a239cf9f010e4 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Sun, 22 Mar 2020 15:49:47 -0700
Subject: Try asserting no static decl rather than warning

This didn't exist in my machine, but it may exist in some CI
environments.

diff --git a/tool/transform_mjit_header.rb b/tool/transform_mjit_header.rb
index 669e549..f3ca2c5 100644
--- a/tool/transform_mjit_header.rb
+++ b/tool/transform_mjit_header.rb
@@ -279,7 +279,7 @@ while (decl_range = MJITHeader.find_decl(code, stop_pos)) https://github.com/ruby/ruby/blob/trunk/tool/transform_mjit_header.rb#L279
     decl[match.begin(0)...match.end(0)] = ''
 
     if decl =~ /\bstatic\b/
-      transform_logs[:static_inside_extern] << decl_name
+      abort "#{PROGRAM}: a static decl was found inside external definition #{decl_name.dump}"
     end
 
     header.sub!(/(extern|inline) /, ' ')
@@ -301,7 +301,6 @@ messages = { https://github.com/ruby/ruby/blob/trunk/tool/transform_mjit_header.rb#L301
   def_to_decl: 'changing definition to declaration',
   static_inline_def: 'making external definition static inline',
   static_inline_decl: 'making declaration static inline',
-  static_inside_extern: 'a static decl inside external definition',
   skipped: 'SKIPPED to transform',
 }
 transform_logs.each do |key, decl_names|
-- 
cgit v0.10.2


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

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