backtracie 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e804bb5ef00e6d7a3f9b7a0a57468026f3f58dbc36671e28d49f3a65e0cb6ad5
-  data.tar.gz: c1c2851579f8eab2bc9fbbdd8b6efa82636d48e141f8a7ea505b9f8e5329b7ab
+  metadata.gz: c21fb6f1864cd78c05807151502cbd12e3dfb8a1d5517d05389e2ac29297a69b
+  data.tar.gz: 126edf9c0e78607a9a6029f08e8a1ae0e4d1a02496ac56a0f67aae349f65ca05
 SHA512:
-  metadata.gz: 2bd4613237a00b0c872ba229cb0401af1ea9d9eb9ea559f3ded3a44779c6e5e6c4599a7639abac19c1e3e8069c5dc44de8d157f32dbb3bed160d3d987c8c8458
-  data.tar.gz: 3846369e8865a9ec7d8c2589b3d1eb3737c242479ac3df8bb9b781ae64fdb0ed3d10a9da503cae7c5a2568b879251fbe5d74e67d88ca9dbfba98ac56a591a5dd
+  metadata.gz: fbda4c7a47305e4896ff0d39da7f5cf997f766f55e66ea5db0c7c50b2506bb103397f01f58fb2ee3f9b0ea89a975f6d1fdf5b9db91b934cca0c66e51adf96265
+  data.tar.gz: af7c5c55fa5339a60a10a49f69aac02ad35b5e99a14e1de33e7988178e976f382e2c8c9260924741d218c44b030058bbf07264d5a9fd1612195752b56264d21a

data/ext/backtracie_native_extension/backtracie_frames.c

@@ -582,7 +582,7 @@ static void mod_to_s_singleton(VALUE klass, strbuilder_t *strout) {
   if (singleton_of == rb_cModule || singleton_of == rb_cClass) {
     // The first case. Use the id_attached symbol to get what this is the
     // singleton_class _of_.
-    st_lookup(RCLASS_IV_TBL(klass), id__attached__, (st_data_t *)&singleton_of);
+    singleton_of = rb_ivar_get(klass, id__attached__);
   }
   mod_to_s(singleton_of, strout);
 }
@@ -609,9 +609,17 @@ static void mod_to_s(VALUE klass, strbuilder_t *strout) {
 
   VALUE klass_name = rb_mod_name(klass);
   if (!RTEST(rb_mod_name(klass))) {
-    mod_to_s_anon(klass, strout);
-    strbuilder_append(strout, "$anonymous");
-    return;
+    // If I understood it correctly, a T_ICLASS represents the inclusion of a module into
+    // a class. In this situation, we usually want to use the module name instead.
+    if (RB_TYPE_P(klass, T_ICLASS)) {
+      VALUE included_module = RBASIC(klass)->klass;
+      mod_to_s(included_module, strout);
+      return;
+    } else {
+      mod_to_s_anon(klass, strout);
+      strbuilder_append(strout, "$anonymous");
+      return;
+    }
   }
 
   // Non-anonymous module/class.
@@ -673,6 +681,9 @@ static void minimal_location_method_qualifier(const minimal_location_t *loc,
   case BACKTRACIE_METHOD_QUALIFIER_CONTENTS_CME_CLASS:
     method_target = loc->method_qualifier.cme_defined_class;
     break;
+  default:
+    strbuilder_append(strout, "FIXME_SHOULD_NEVER_HAPPEN");
+    return;
   }
 
   mod_to_s(method_target, strout);

data/ext/backtracie_native_extension/extconf.rb

@@ -20,60 +20,60 @@
 
 if %w[jruby truffleruby].include?(RUBY_ENGINE)
   raise \
-    "\n#{'-' * 80}\nSorry! This gem is unsupported on #{RUBY_ENGINE}. Since it relies on a lot of guts of MRI Ruby, " \
+    "\n#{"-" * 80}\nSorry! This gem is unsupported on #{RUBY_ENGINE}. Since it relies on a lot of guts of MRI Ruby, " \
     "it's impossible to make a direct port.\n" \
-    "Perhaps a #{RUBY_ENGINE} equivalent could be created -- help is welcome! :)\n#{'-' * 80}"
+    "Perhaps a #{RUBY_ENGINE} equivalent could be created -- help is welcome! :)\n#{"-" * 80}"
 end
 
-require 'mkmf'
+require "mkmf"
 
 # This warning gets really annoying when we include the Ruby mjit header file,
 # let's omit it
-$CFLAGS << ' ' << '-Wno-unused-function'
+$CFLAGS << " " << "-Wno-unused-function"
 
 # Really dislike the "define everything at the beginning of the function" thing, sorry!
-$CFLAGS << ' ' << '-Wno-declaration-after-statement'
+$CFLAGS << " " << "-Wno-declaration-after-statement"
 
 # If we forget to include a Ruby header, the function call may still appear to work, but then
 # cause a segfault later. Let's ensure that never happens.
-$CFLAGS << ' ' << '-Werror-implicit-function-declaration'
+$CFLAGS << " " << "-Werror-implicit-function-declaration"
 
 # Enable us to use """modern""" C. Note that Ruby requires GNU extensions; specifically,
 # NSIG is expected to be defined in signal.h.
-$CFLAGS << ' ' << '-std=gnu99' if RUBY_VERSION < '2.4'
+$CFLAGS << " " << "-std=gnu99" if RUBY_VERSION < "2.4"
 
-$CFLAGS << ' ' << '-DPRE_RB_ISEQ_TYPE' if RUBY_VERSION < '3.2'
+$CFLAGS << " " << "-DPRE_RB_ISEQ_TYPE" if RUBY_VERSION < "3.2"
 
-$CFLAGS << ' ' << '-DPRE_GC_MARK_MOVABLE' if RUBY_VERSION < '2.7'
+$CFLAGS << " " << "-DPRE_GC_MARK_MOVABLE" if RUBY_VERSION < "2.7"
 
 # Older Rubies don't have the MJIT header, see below for details
-$defs << '-DPRE_MJIT_RUBY' if RUBY_VERSION < '2.6'
+$defs << "-DPRE_MJIT_RUBY" if RUBY_VERSION < "2.6"
 
-if RUBY_VERSION < '2.5'
-  $CFLAGS << ' ' << '-DPRE_EXECUTION_CONTEXT' # Flag that there's no execution context, we need to use threads instead
-  $CFLAGS << ' ' << '-DPRE_LOCATION_PATHOBJ'
-  $CFLAGS << ' ' << '-Wno-attributes' # Silence a few warnings that we can't do anything about
+if RUBY_VERSION < "2.5"
+  $CFLAGS << " " << "-DPRE_EXECUTION_CONTEXT" # Flag that there's no execution context, we need to use threads instead
+  $CFLAGS << " " << "-DPRE_LOCATION_PATHOBJ"
+  $CFLAGS << " " << "-Wno-attributes" # Silence a few warnings that we can't do anything about
 end
 
-if RUBY_VERSION < '2.4'
-  $CFLAGS << ' ' << '-DPRE_VM_ENV_RENAMES' # Flag that it's a really old Ruby, and a few constants were since renamed
+if RUBY_VERSION < "2.4"
+  $CFLAGS << " " << "-DPRE_VM_ENV_RENAMES" # Flag that it's a really old Ruby, and a few constants were since renamed
 end
 
-$CFLAGS << ' ' << '-DBACKTRACIE_EXPORTS'
-append_cflags ['-fvisibility=hidden']
+$CFLAGS << " " << "-DBACKTRACIE_EXPORTS"
+append_cflags ["-fvisibility=hidden"]
 create_header
 
-if RUBY_VERSION < '2.6'
+if RUBY_VERSION < "2.6"
   # Use the debase-ruby_core_source gem to get access to Ruby internal structures (no MJIT header -- the preferred
   # option -- is available for these older Rubies)
 
-  require 'debase/ruby_core_source'
-  dir_config('ruby') # allow user to pass in non-standard core include directory
+  require "debase/ruby_core_source"
+  dir_config("ruby") # allow user to pass in non-standard core include directory
   unless Debase::RubyCoreSource.create_makefile_with_core(
-    proc { ['vm_core.h', 'method.h', 'iseq.h', 'regenc.h'].map { |it| have_header(it) }.uniq == [true] },
-    'backtracie_native_extension'
+    proc { ["vm_core.h", "method.h", "iseq.h", "regenc.h"].map { |it| have_header(it) }.uniq == [true] },
+    "backtracie_native_extension"
   )
-    raise 'Error during native gem setup -- `Debase::RubyCoreSource.create_makefile_with_core` failed'
+    raise "Error during native gem setup -- `Debase::RubyCoreSource.create_makefile_with_core` failed"
   end
 
 else
@@ -84,14 +84,14 @@ else
   # containing the exact file, so that it can be used in a #include in the C code.
   header_contents =
     File.read($extconf_h)
-        .sub('#endif',
-             <<~EXTCONF_H.strip
-               #define RUBY_MJIT_HEADER "rb_mjit_min_header-#{RUBY_VERSION}.h"
+      .sub("#endif",
+        <<~EXTCONF_H.strip
+          #define RUBY_MJIT_HEADER "rb_mjit_min_header-#{RUBY_VERSION}.h"
 
-               #endif
-             EXTCONF_H
-            )
-  File.open($extconf_h, 'w') { |file| file.puts(header_contents) }
+          #endif
+        EXTCONF_H
+      )
+  File.open($extconf_h, "w") { |file| file.puts(header_contents) }
 
-  create_makefile 'backtracie_native_extension'
+  create_makefile "backtracie_native_extension"
 end

data/ext/backtracie_native_extension/strbuilder.h

@@ -14,7 +14,7 @@ typedef struct {
 } strbuilder_t;
 
 void strbuilder_append(strbuilder_t *str, const char *cat);
-void strbuilder_appendf(strbuilder_t *str, const char *fmt, ...);
+void strbuilder_appendf(strbuilder_t *str, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
 void strbuilder_append_value(strbuilder_t *str, VALUE val);
 VALUE strbuilder_to_value(strbuilder_t *str);
 void strbuilder_init(strbuilder_t *str, char *buf, size_t bufsize);

data/lib/backtracie/version.rb

@@ -19,5 +19,5 @@
 # along with backtracie.  If not, see <http://www.gnu.org/licenses/>.
 
 module Backtracie
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backtracie
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ivo Anjo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -59,7 +59,7 @@ homepage: https://github.com/ivoanjo/backtracie
 licenses:
 - LGPL-3.0+
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -75,8 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.1
+signing_key: 
 specification_version: 4
 summary: Ruby gem for beautiful backtraces
 test_files: []