diff --git a/NEWS.md b/NEWS.md index 80e1afcdef8f1c..90119c910b2b6e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -47,9 +47,10 @@ Other changes are listed in the following sections. We also listed release history from the previous bundled version that is Ruby 3.4.0 if it has GitHub releases. -### The following bundled gem is promoted from default gems. +### The following bundled gems are promoted from default gems. * tsort 0.2.0 +* win32-registry 0.1.2 ### The following default gem is added. @@ -80,6 +81,7 @@ releases. * repl_type_completor 0.1.13 * pstore 0.2.1 * rdoc 7.2.0 +* win32ole 1.9.3 * irb 1.17.0 ### RubyGems and Bundler diff --git a/common.mk b/common.mk index dfe884267da471..1127e798063239 100644 --- a/common.mk +++ b/common.mk @@ -800,7 +800,10 @@ RUBYSPEC_CAPIEXT_SRCDIR = $(srcdir)/$(RUBYSPEC_CAPIEXT) RUBYSPEC_CAPIEXT_DEPS = $(RUBYSPEC_CAPIEXT_SRCDIR)/rubyspec.h $(RUBY_H_INCLUDES) {$(VPATH)}internal/abi.h $(LIBRUBY) RUBYSPEC_CAPIEXT_BUILD = $(enable_shared:yes=rubyspec-capiext) -rubyspec-capiext: build-ext $(DOT_WAIT) +yes-rubyspec-capiext: build-ext + $(ACTIONS_GROUP) +rubyspec-capiext: build-ext $(DOT_WAIT) yes-rubyspec-capiext $(DOT_WAIT) + $(ACTIONS_ENDGROUP) # make-dependent rules should be included after this and built after build-ext. clean-spec: PHONY diff --git a/defs/gmake.mk b/defs/gmake.mk index f4b3d799902379..475ad61602d4aa 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -516,7 +516,7 @@ fix-depends check-depends: all hello # order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT) # because the same named directory exists in the source tree. $(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(RUBYSPEC_CAPIEXT_DEPS) \ - | build-ext + | build-ext yes-rubyspec-capiext $(no_silence:no=$(ECHO) building $@) $(Q) $(MAKEDIRS) $(@D) $(Q) $(DLDSHARED) -L. $(XDLDFLAGS) $(XLDFLAGS) $(LDFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBYARG) @@ -525,9 +525,8 @@ ifneq ($(POSTLINK),) endif $(Q) $(RMALL) $@.* -RUBYSPEC_CAPIEXT_SO := $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c))) -rubyspec-capiext: $(RUBYSPEC_CAPIEXT_SO) - @ $(NULLCMD) +RUBYSPEC_CAPIEXT_EXTS := $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c))) +rubyspec-capiext: $(RUBYSPEC_CAPIEXT_EXTS) spec/%/ spec/%_spec.rb: programs exts $(RUBYSPEC_CAPIEXT_BUILD) PHONY +$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec-run -B $(srcdir)/spec/default.mspec $(SPECOPTS) $(patsubst %,$(srcdir)/%,$@) diff --git a/dir.c b/dir.c index 9498d67da9235a..d67de8cf06c830 100644 --- a/dir.c +++ b/dir.c @@ -1586,23 +1586,29 @@ dir_chdir(VALUE dir) } #ifndef _WIN32 -VALUE -rb_dir_getwd_ospath(void) +static VALUE +getcwd_to_str(VALUE arg) { - char *path; - VALUE cwd; - VALUE path_guard; - - path_guard = rb_imemo_tmpbuf_new(); - path = ruby_getcwd(); - rb_imemo_tmpbuf_set_ptr(path_guard, path); + const char *path = (const char *)arg; #ifdef __APPLE__ - cwd = rb_str_normalize_ospath(path, strlen(path)); + return rb_str_normalize_ospath(path, strlen(path)); #else - cwd = rb_str_new2(path); + return rb_str_new2(path); #endif - rb_free_tmp_buffer(&path_guard); - return cwd; +} + +static VALUE +getcwd_xfree(VALUE arg) +{ + xfree((void *)arg); + return Qnil; +} + +VALUE +rb_dir_getwd_ospath(void) +{ + char *path = ruby_getcwd(); + return rb_ensure(getcwd_to_str, (VALUE)path, getcwd_xfree, (VALUE)path); } #endif diff --git a/doc/maintainers.md b/doc/maintainers.md index 11c7e9ab087bcb..6b820a516a32d4 100644 --- a/doc/maintainers.md +++ b/doc/maintainers.md @@ -616,6 +616,12 @@ It may needs to make consensus on ruby-core/ruby-dev before making major changes * https://github.com/ruby/tsort * https://rubygems.org/gems/tsort +#### win32-registry + +* Nakamura Usaku ([unak]) +* https://github.com/ruby/win32-registry +* https://rubygems.org/gems/win32-registry + ## Platform Maintainers ### mswin64 (Microsoft Windows) diff --git a/doc/standard_library.md b/doc/standard_library.md index 91a50af0c3923f..782db10c37f583 100644 --- a/doc/standard_library.md +++ b/doc/standard_library.md @@ -124,6 +124,7 @@ of each. - [readline]: Wrapper for the Readline extension and Reline - [fiddle]: A libffi wrapper for Ruby - [tsort]: Topological sorting using Tarjan's algorithm +- [win32-registry]: Registry accessor library for the Windows platform. ## Tools @@ -208,6 +209,7 @@ of each. [uri]: https://github.com/ruby/uri [weakref]: https://github.com/ruby/weakref [win32ole]: https://github.com/ruby/win32ole +[win32-registry]: https://github.com/ruby/win32-registry [yaml]: https://github.com/ruby/yaml [zlib]: https://github.com/ruby/zlib diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb index 39e414beb8f353..f28be7f7731d75 100644 --- a/ext/json/lib/json.rb +++ b/ext/json/lib/json.rb @@ -201,10 +201,10 @@ # defaults to +false+. # # With the default, +false+: -# JSON.parse(%{"Hell\\o"}) # invalid escape character in string (JSON::ParserError) +# JSON.parse('"Hell\o"') # invalid escape character in string (JSON::ParserError) # # When enabled: -# JSON.parse(%{"Hell\\o"}, allow_invalid_escape: true) # => "Hello" +# JSON.parse('"Hell\o"', allow_invalid_escape: true) # => "Hello" # # ====== Output Options # diff --git a/ext/win32/lib/win32/registry.rb b/ext/win32/lib/win32/registry.rb deleted file mode 100644 index 5f8099baa2c160..00000000000000 --- a/ext/win32/lib/win32/registry.rb +++ /dev/null @@ -1,943 +0,0 @@ -# frozen_string_literal: true -require 'fiddle/import' - -# Generic namespace for Windows platform-specific features. -module Win32 - # :stopdoc: - WCHAR = Encoding::UTF_16LE - WCHAR_NUL = "\0".encode(WCHAR).freeze - WCHAR_CR = "\r".encode(WCHAR).freeze - WCHAR_SIZE = WCHAR_NUL.bytesize - LOCALE = Encoding::UTF_8 - - # :startdoc: - - # win32/registry is registry accessor library for Win32 platform. - # It uses importer to call Win32 Registry APIs. - # - # == example - # Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg| - # value = reg['foo'] # read a value - # value = reg['foo', Win32::Registry::REG_SZ] # read a value with type - # type, value = reg.read('foo') # read a value - # reg['foo'] = 'bar' # write a value - # reg['foo', Win32::Registry::REG_SZ] = 'bar' # write a value with type - # reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value - # - # reg.each_value { |name, type, data| ... } # Enumerate values - # reg.each_key { |key, wtime| ... } # Enumerate subkeys - # - # reg.delete_value(name) # Delete a value - # reg.delete_key(name) # Delete a subkey - # reg.delete_key(name, true) # Delete a subkey recursively - # end - # - # == Predefined keys - # - # * +HKEY_CLASSES_ROOT+ - # * +HKEY_CURRENT_USER+ - # * +HKEY_LOCAL_MACHINE+ - # * +HKEY_PERFORMANCE_DATA+ - # * +HKEY_CURRENT_CONFIG+ - # * +HKEY_DYN_DATA+ - # - # Win32::Registry object whose key is predefined key. - # For detail, see the article[https://learn.microsoft.com/en-us/windows/win32/sysinfo/predefined-keys]. - # - # == Value types - # - # * +REG_NONE+ - # * +REG_SZ+ - # * +REG_EXPAND_SZ+ - # * +REG_BINARY+ - # * +REG_DWORD+ - # * +REG_DWORD_BIG_ENDIAN+ - # * +REG_LINK+ - # * +REG_MULTI_SZ+ - # * +REG_RESOURCE_LIST+ - # * +REG_FULL_RESOURCE_DESCRIPTOR+ - # * +REG_RESOURCE_REQUIREMENTS_LIST+ - # * +REG_QWORD+ - # - # For detail, see the article[https://learn.microsoft.com/en-us/windows/win32/sysinfo/registry-value-types]. - # - class Registry - - # :stopdoc: - - # - # For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp]. - # - # --- HKEY_* - # - # Predefined key *handle*. - # These are Integer, not Win32::Registry. - # - # --- REG_* - # - # Registry value type. - # - # --- KEY_* - # - # Security access mask. - # - # --- KEY_OPTIONS_* - # - # Key options. - # - # --- REG_CREATED_NEW_KEY - # - # --- REG_OPENED_EXISTING_KEY - # - # If the key is created newly or opened existing key. - # See also Registry#disposition method. - module Constants - # :stopdoc: - HKEY_CLASSES_ROOT = 0x80000000 - HKEY_CURRENT_USER = 0x80000001 - HKEY_LOCAL_MACHINE = 0x80000002 - HKEY_USERS = 0x80000003 - HKEY_PERFORMANCE_DATA = 0x80000004 - HKEY_PERFORMANCE_TEXT = 0x80000050 - HKEY_PERFORMANCE_NLSTEXT = 0x80000060 - HKEY_CURRENT_CONFIG = 0x80000005 - HKEY_DYN_DATA = 0x80000006 - - REG_NONE = 0 - REG_SZ = 1 - REG_EXPAND_SZ = 2 - REG_BINARY = 3 - REG_DWORD = 4 - REG_DWORD_BIG_ENDIAN = 5 - REG_LINK = 6 - REG_MULTI_SZ = 7 - REG_RESOURCE_LIST = 8 - REG_FULL_RESOURCE_DESCRIPTOR = 9 - REG_RESOURCE_REQUIREMENTS_LIST = 10 - REG_QWORD = 11 - REG_QWORD_LITTLE_ENDIAN = 11 - - STANDARD_RIGHTS_READ = 0x00020000 - STANDARD_RIGHTS_WRITE = 0x00020000 - KEY_QUERY_VALUE = 0x0001 - KEY_SET_VALUE = 0x0002 - KEY_CREATE_SUB_KEY = 0x0004 - KEY_ENUMERATE_SUB_KEYS = 0x0008 - KEY_NOTIFY = 0x0010 - KEY_CREATE_LINK = 0x0020 - KEY_READ = STANDARD_RIGHTS_READ | - KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY - KEY_WRITE = STANDARD_RIGHTS_WRITE | - KEY_SET_VALUE | KEY_CREATE_SUB_KEY - KEY_EXECUTE = KEY_READ - KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK - - REG_OPTION_RESERVED = 0x0000 - REG_OPTION_NON_VOLATILE = 0x0000 - REG_OPTION_VOLATILE = 0x0001 - REG_OPTION_CREATE_LINK = 0x0002 - REG_OPTION_BACKUP_RESTORE = 0x0004 - REG_OPTION_OPEN_LINK = 0x0008 - REG_LEGAL_OPTION = REG_OPTION_RESERVED | - REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK | - REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK - - REG_CREATED_NEW_KEY = 1 - REG_OPENED_EXISTING_KEY = 2 - - REG_WHOLE_HIVE_VOLATILE = 0x0001 - REG_REFRESH_HIVE = 0x0002 - REG_NO_LAZY_FLUSH = 0x0004 - REG_FORCE_RESTORE = 0x0008 - - MAX_KEY_LENGTH = 514 - MAX_VALUE_LENGTH = 32768 - end - include Constants - include Enumerable - # :startdoc: - - # - # Error - # - class Error < ::StandardError - # :stopdoc: - module Kernel32 - extend Fiddle::Importer - dlload "kernel32.dll" - end - FormatMessageW = Kernel32.extern "int FormatMessageW(int, void *, int, int, void *, int, void *)", :stdcall - # :startdoc: - - # new(code) -> error object - # - # Initializes the message for Win32 API error +code+. - def initialize(code) - @code = code - buff = WCHAR_NUL * 1024 - lang = 0 - begin - len = FormatMessageW.call(0x1200, nil, code, lang, buff, 1024, nil) - msg = buff.byteslice(0, len * WCHAR_SIZE) - msg.delete!(WCHAR_CR) - msg.chomp! - msg.encode!(LOCALE) - rescue EncodingError - raise unless lang == 0 - lang = 0x0409 # en_US - retry - end - super msg - end - - # Win32 API error code. - attr_reader :code - end - - # - # Predefined Keys - # - class PredefinedKey < Registry - # :stopdoc: - def initialize(hkey, keyname) - @hkey = Fiddle::Pointer.new(hkey) - @parent = nil - @keyname = keyname - @disposition = REG_OPENED_EXISTING_KEY - end - - # Predefined keys cannot be closed - def close - raise Error.new(5) ## ERROR_ACCESS_DENIED - end - - # Fake #class method for Registry#open, Registry#create - def class - Registry - end - - # Make all - Constants.constants.grep(/^HKEY_/) do |c| - Registry.const_set c, new(Constants.const_get(c), c.to_s) - end - end - - # - # Win32 APIs - # - module API - # :stopdoc: - include Constants - extend Fiddle::Importer - dlload "advapi32.dll" - [ - "long RegOpenKeyExW(void *, void *, long, long, void *)", - "long RegCreateKeyExW(void *, void *, long, long, long, long, void *, void *, void *)", - "long RegEnumValueW(void *, long, void *, void *, void *, void *, void *, void *)", - "long RegEnumKeyExW(void *, long, void *, void *, void *, void *, void *, void *)", - "long RegQueryValueExW(void *, void *, void *, void *, void *, void *)", - "long RegSetValueExW(void *, void *, long, long, void *, long)", - "long RegDeleteValueW(void *, void *)", - "long RegDeleteKeyW(void *, void *)", - "long RegFlushKey(void *)", - "long RegCloseKey(void *)", - "long RegQueryInfoKeyW(void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *, void *)", - ].each do |fn| - cfunc = extern fn, :stdcall - const_set cfunc.name.intern, cfunc - end - - module_function - - def check(result) - raise Error, result, caller(1) if result != 0 - end - - def win64? - /^(?:x64|x86_64)/ =~ RUBY_PLATFORM - end - - TEMPLATE_HANDLE = 'J<' - - def packhandle(h) - [h].pack(TEMPLATE_HANDLE) - end - - def unpackhandle(h) - (h + [0].pack(TEMPLATE_HANDLE)).unpack1(TEMPLATE_HANDLE) - end - - TEMPLATE_DWORD = 'V' - - def packdw(dw) - [dw].pack(TEMPLATE_DWORD) - end - - def unpackdw(dw) - (dw + [0].pack(TEMPLATE_DWORD)).unpack1(TEMPLATE_DWORD) - end - - TEMPLATE_QWORD = 'Q<' - - def packqw(qw) - [qw].pack(TEMPLATE_QWORD) - end - - def unpackqw(qw) - (qw + [0].pack(TEMPLATE_QWORD)).unpack1(TEMPLATE_QWORD) - end - - def make_wstr(str) - (str+"\0").encode(WCHAR) - end - - def OpenKey(hkey, name, opt, desired) - result = packhandle(0) - check RegOpenKeyExW.call(hkey, make_wstr(name), opt, desired, result) - unpackhandle(result) - end - - def CreateKey(hkey, name, opt, desired) - result = packhandle(0) - disp = packdw(0) - check RegCreateKeyExW.call(hkey, make_wstr(name), 0, 0, opt, desired, - nil, result, disp) - [ unpackhandle(result), unpackdw(disp) ] - end - - def EnumValue(hkey, index) - name = WCHAR_NUL * Constants::MAX_KEY_LENGTH - size = packdw(Constants::MAX_KEY_LENGTH) - check RegEnumValueW.call(hkey, index, name, size, nil, nil, nil, nil) - name.byteslice(0, unpackdw(size) * WCHAR_SIZE) - end - - def EnumKey(hkey, index) - name = WCHAR_NUL * Constants::MAX_KEY_LENGTH - size = packdw(Constants::MAX_KEY_LENGTH) - wtime = ' ' * 8 - check RegEnumKeyExW.call(hkey, index, name, size, nil, nil, nil, wtime) - [ name.byteslice(0, unpackdw(size) * WCHAR_SIZE), unpackqw(wtime) ] - end - - def QueryValue(hkey, name) - type = packdw(0) - size = packdw(0) - name = make_wstr(name) - check RegQueryValueExW.call(hkey, name, nil, type, nil, size) - data = "\0".b * unpackdw(size) - check RegQueryValueExW.call(hkey, name, nil, type, data, size) - [ unpackdw(type), data[0, unpackdw(size)] ] - end - - def SetValue(hkey, name, type, data, size) - case type - when REG_SZ, REG_EXPAND_SZ, REG_MULTI_SZ - data = data.encode(WCHAR) - size ||= data.bytesize + WCHAR_SIZE - end - check RegSetValueExW.call(hkey, make_wstr(name), 0, type, data, size) - end - - def DeleteValue(hkey, name) - check RegDeleteValueW.call(hkey, make_wstr(name)) - end - - def DeleteKey(hkey, name) - check RegDeleteKeyW.call(hkey, make_wstr(name)) - end - - def FlushKey(hkey) - check RegFlushKey.call(hkey) - end - - def CloseKey(hkey) - check RegCloseKey.call(hkey) - end - - def QueryInfoKey(hkey) - subkeys = packdw(0) - maxsubkeylen = packdw(0) - values = packdw(0) - maxvaluenamelen = packdw(0) - maxvaluelen = packdw(0) - secdescs = packdw(0) - wtime = ' ' * 8 - check RegQueryInfoKeyW.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0, - values, maxvaluenamelen, maxvaluelen, secdescs, wtime) - [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values), - unpackdw(maxvaluenamelen), unpackdw(maxvaluelen), - unpackdw(secdescs), unpackqw(wtime) ] - end - end - # :startdoc: - - # - # Replace %-enclosed substrings in +str+ into the - # environment value of what is contained between the %s. - # This method is used for REG_EXPAND_SZ. - # - # For detail, see ExpandEnvironmentStrings[https://learn.microsoft.com/en-us/windows/win32/api/processenv/nf-processenv-expandenvironmentstringsw] \Win32 \API. - # - def self.expand_environ(str) - str.gsub(Regexp.compile("%([^%]+)%".encode(str.encoding))) { - v = $1.encode(LOCALE) - (ENV[v] || ENV[v.upcase])&.encode(str.encoding) || $& - } - end - - @@type2name = %w[ - REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD - REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ - REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR - REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD - ].inject([]) do |ary, type| - ary[Constants.const_get(type)] = type - ary - end.freeze - - # - # Convert registry type value +type+ to readable string. - # - def self.type2name(type) - @@type2name[type] || type.to_s - end - - # - # Convert 64-bit FILETIME integer +wtime+ into Time object. - # - def self.wtime2time(wtime) - Time.at((wtime - 116444736000000000) / 10000000) - end - - # - # Convert Time object or Integer object +time+ into 64-bit FILETIME. - # - def self.time2wtime(time) - time.to_i * 10000000 + 116444736000000000 - end - - # - # constructor - # - private_class_method :new - - # - # call-seq: - # open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) - # open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... } - # - # Open the registry key +subkey+ under +key+. - # +key+ is Win32::Registry object of parent key. - # You can use {predefined key}[rdoc-ref:Win32::Registry@Predefined+keys] +HKEY_+*. - # +desired+ and +opt+ is access mask and key option. - # - # For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp]. - # - # If block is given, the key +reg+ is yielded and closed - # automatically after the block exists. - def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) - subkey = subkey.chomp('\\') - newkey = API.OpenKey(hkey.instance_variable_get(:@hkey), subkey, opt, desired) - obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY) - if block_given? - begin - yield obj - ensure - obj.close - end - else - obj - end - end - - # - # call-seq: - # create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) - # create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... } - # - # Create or open the registry key +subkey+ under +key+. - # You can use {predefined key}[rdoc-ref:Win32::Registry@Predefined+keys] +HKEY_+*. - # +desired+ and +opt+ is access mask and key option. - # - # If +subkey+ is already exists, key is opened and Registry#created? - # method will return false. - # - # If block is given, the key +reg+ is yielded and closed - # automatically after the block exists. - # - def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) - newkey, disp = API.CreateKey(hkey.instance_variable_get(:@hkey), subkey, opt, desired) - obj = new(newkey, hkey, subkey, disp) - if block_given? - begin - yield obj - ensure - obj.close - end - else - obj - end - end - - # - # finalizer - # - @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } } - - # - # :nodoc: - # - # Use self.open, self.create, #open and #create. - # - def initialize(hkey, parent, keyname, disposition) - @hkey = Fiddle::Pointer.new(hkey) - @parent = parent - @keyname = keyname - @disposition = disposition - @hkeyfinal = [ hkey ] - ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal) - end - - # Win32::Registry object of parent key, or nil if predefined key. - attr_reader :parent - # Same as subkey value of Registry.open or - # Registry.create method. - attr_reader :keyname - # Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY). - attr_reader :disposition - - # Returns key handle value. - def hkey - @hkey.to_i - end - - # - # Returns +true+ if key is created *newly*. - # (see Registry.create) -- basically you call create - # then when you call created? on the instance returned - # it will tell if it was successful or not - # - def created? - @disposition == REG_CREATED_NEW_KEY - end - - # - # Returns if key is not closed. - # - def open? - !@hkey.nil? - end - - # - # Full path of key such as 'HKEY_CURRENT_USER\SOFTWARE\foo\bar'. - # - def name - parent = self - name = @keyname - while parent = parent.parent - name = parent.keyname + '\\' + name - end - name - end - - # - # Retruns inspected string - # - def inspect - "\#" - end - - # - # marshalling is not allowed - # - def _dump(depth) - raise TypeError, "can't dump Win32::Registry" - end - - # - # Same as Win32::Registry.open(self, subkey, desired, opt) - # - def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk) - self.class.open(self, subkey, desired, opt, &blk) - end - - # - # Same as Win32::Registry.create(self, subkey, desired, opt) - # - def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk) - self.class.create(self, subkey, desired, opt, &blk) - end - - # - # Close key. - # - # After close, most method raise an error. - # - def close - API.CloseKey(@hkey) - @hkey = @parent = @keyname = nil - @hkeyfinal[0] = nil - end - - # - # Enumerate all values in this registry path. - # - # For each value it yields key, type and data. - # - # key is a String which contains name of key. - # type is a type constant kind of +Win32::Registry::REG_+* - # data is the value of this key. - # - def each_value - return enum_for(:each_value) unless block_given? - index = 0 - while true - begin - subkey = API.EnumValue(@hkey, index) - rescue Error - break - end - subkey = export_string(subkey) - begin - type, data = read(subkey) - rescue Error - else - yield subkey, type, data - end - index += 1 - end - index - end - alias each each_value - - # - # return values as an array - # - def values - vals_ary = [] - each_value { |*, val| vals_ary << val } - vals_ary - end - - # - # Enumerate all subkeys. - # - # For each subkey it yields subkey and wtime. - # - # subkey is String which contains name of subkey. - # wtime is last write time as FILETIME (64-bit integer). - # (see Registry.wtime2time) - # - def each_key - return enum_for(:each_key) unless block_given? - index = 0 - while true - begin - subkey, wtime = API.EnumKey(@hkey, index) - rescue Error - break - end - subkey = export_string(subkey) - yield subkey, wtime - index += 1 - end - index - end - - # - # return keys as an array - # - def keys - keys_ary = [] - each_key { |key,| keys_ary << key } - keys_ary - end - - # Read a registry value named name and return array of - # [ type, data ]. - # When name is +nil+, the `default' value is read. - # - # +type+ is {value type}[rdoc-ref:Win32::Registry@Value+types]. - # - # +data+ is value data, its class is: - # REG_SZ, REG_EXPAND_SZ:: - # String - # REG_MULTI_SZ:: - # Array of String - # REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD:: - # Integer - # REG_BINARY, REG_NONE:: - # String (contains binary data) - # - # When _rtype_ is specified, the value type must be included by - # _rtype_ array, or +TypeError+ is raised. - def read(name, *rtype) - type, data = API.QueryValue(@hkey, name) - unless rtype.empty? or rtype.include?(type) - raise TypeError, "Type mismatch (expect [#{ - rtype.map{|t|Registry.type2name(t)}.join(', ')}] but #{ - Registry.type2name(type)} present)" - end - case type - when REG_SZ, REG_EXPAND_SZ - [ type, data.encode(name.encoding, WCHAR).chop ] - when REG_MULTI_SZ - [ type, data.encode(name.encoding, WCHAR).split(/\0/) ] - when REG_BINARY, REG_NONE - [ type, data ] - when REG_DWORD - [ type, API.unpackdw(data) ] - when REG_DWORD_BIG_ENDIAN - [ type, data.unpack1('N') ] - when REG_QWORD - [ type, API.unpackqw(data) ] - else - raise TypeError, "Type #{Registry.type2name(type)} is not supported." - end - end - - # - # Read a registry value named name and return its value data. - # The class of the value is the same as the #read method returns. - # - # If the value type is REG_EXPAND_SZ, returns value data whose environment - # variables are replaced. - # If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD, - # REG_DWORD_BIG_ENDIAN, nor REG_QWORD, +TypeError+ is raised. - # - # The meaning of _rtype_ is the same as for the #read method. - # - def [](name, *rtype) - type, data = read(name, *rtype) - case type - when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ - data - when REG_EXPAND_SZ - Registry.expand_environ(data) - else - raise TypeError, "Type #{Registry.type2name(type)} is not supported." - end - end - - # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin) - # registry value named name. - # - # If the values type does not match, +TypeError+ is raised. - def read_s(name) - read(name, REG_SZ)[1] - end - - # - # Read a REG_SZ or REG_EXPAND_SZ registry value named name. - # - # If the value type is REG_EXPAND_SZ, environment variables are replaced. - # Unless the value type is REG_SZ or REG_EXPAND_SZ, +TypeError+ is raised. - # - def read_s_expand(name) - type, data = read(name, REG_SZ, REG_EXPAND_SZ) - if type == REG_EXPAND_SZ - Registry.expand_environ(data) - else - data - end - end - - # - # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin) - # registry value named name. - # - # If the values type does not match, +TypeError+ is raised. - # - def read_i(name) - read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1] - end - - # - # Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin) - # registry value named name. - # - # If the values type does not match, +TypeError+ is raised. - # - def read_bin(name) - read(name, REG_BINARY)[1] - end - - # - # Write data to a registry value named name. - # When name is nil, write to the `default' value. - # - # +type+ is {value type}[rdoc-ref:Win32::Registry@Value+types]. - # Class of data must be same as which #read - # method returns. - # - def write(name, type, data) - case type - when REG_SZ, REG_EXPAND_SZ - data = data.encode(WCHAR) << WCHAR_NUL - when REG_MULTI_SZ - data = data.to_a.map {|s| s.encode(WCHAR)}.join(WCHAR_NUL) << WCHAR_NUL - when REG_BINARY, REG_NONE - data = data.to_s - when REG_DWORD - data = API.packdw(data.to_i) - when REG_DWORD_BIG_ENDIAN - data = [data.to_i].pack('N') - when REG_QWORD - data = API.packqw(data.to_i) - else - raise TypeError, "Unsupported type #{Registry.type2name(type)}" - end - API.SetValue(@hkey, name, type, data, data.bytesize) - end - - # - # Write value to a registry value named name. - # - # If wtype is specified, the value type is it. - # Otherwise, the value type is depend on class of value: - # - # Integer:: - # REG_DWORD - # String:: - # REG_SZ - # Array:: - # REG_MULTI_SZ - # - def []=(name, rtype, value = nil) - if value - write name, rtype, value - else - case value = rtype - when Integer - write name, REG_DWORD, value - when String - write name, REG_SZ, value - when Array - write name, REG_MULTI_SZ, value - else - raise TypeError, "Unexpected type #{value.class}" - end - end - value - end - - # - # Write value to a registry value named name. - # - # The value type is REG_SZ(write_s), REG_DWORD(write_i), or - # REG_BINARY(write_bin). - # - def write_s(name, value) - write name, REG_SZ, value.to_s - end - - # - # Write value to a registry value named name. - # - # The value type is REG_SZ(write_s), REG_DWORD(write_i), or - # REG_BINARY(write_bin). - # - def write_i(name, value) - write name, REG_DWORD, value.to_i - end - - # - # Write value to a registry value named name. - # - # The value type is REG_SZ(write_s), REG_DWORD(write_i), or - # REG_BINARY(write_bin). - # - def write_bin(name, value) - write name, REG_BINARY, value.to_s - end - - # - # Delete a registry value named name. - # We can not delete the `default' value. - # - def delete_value(name) - API.DeleteValue(@hkey, name) - end - alias delete delete_value - - # - # Delete a subkey named name and all its values. - # - # If recursive is false, the subkey must not have subkeys. - # Otherwise, this method deletes all subkeys and values recursively. - # - def delete_key(name, recursive = false) - if recursive - open(name, KEY_ALL_ACCESS) do |reg| - reg.keys.each do |key| - begin - reg.delete_key(key, true) - rescue Error - # - end - end - end - API.DeleteKey(@hkey, name) - else - begin - API.EnumKey @hkey, 0 - rescue Error - return API.DeleteKey(@hkey, name) - end - raise Error.new(5) ## ERROR_ACCESS_DENIED - end - end - - # - # Write all the attributes into the registry file. - # - def flush - API.FlushKey @hkey - end - - # - # Returns key information as Array of: - # num_keys:: - # The number of subkeys. - # max_key_length:: - # Maximum length of name of subkeys. - # num_values:: - # The number of values. - # max_value_name_length:: - # Maximum length of name of values. - # max_value_length:: - # Maximum length of value of values. - # descriptor_length:: - # Length of security descriptor. - # wtime:: - # Last write time as FILETIME(64-bit integer) - # - # For detail, see RegQueryInfoKey[http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp] Win32 API. - # - def info - API.QueryInfoKey(@hkey) - end - - # - # Returns an item of key information. - # - %w[ - num_keys max_key_length - num_values max_value_name_length max_value_length - descriptor_length wtime - ].each_with_index do |s, i| - eval <<-__END__ - def #{s} - info[#{i}] - end - __END__ - end - - private - - def export_string(str, enc = Encoding.default_internal || LOCALE) # :nodoc: - str.encode(enc) - end - end -end diff --git a/ext/win32/lib/win32/resolv.rb b/ext/win32/lib/win32/resolv.rb index 01e1bda351f990..08fed085634c9b 100644 --- a/ext/win32/lib/win32/resolv.rb +++ b/ext/win32/lib/win32/resolv.rb @@ -6,6 +6,7 @@ require 'win32/resolv.so' +# Generic namespace for Windows platform-specific features. module Win32 module Resolv # :nodoc: # Error at Win32 API diff --git a/ext/win32/win32-registry.gemspec b/ext/win32/win32-registry.gemspec deleted file mode 100644 index 9bd57bd7d1368f..00000000000000 --- a/ext/win32/win32-registry.gemspec +++ /dev/null @@ -1,29 +0,0 @@ -# frozen_string_literal: true -Gem::Specification.new do |spec| - spec.name = "win32-registry" - spec.version = "0.1.2" - spec.authors = ["U.Nakamura"] - spec.email = ["usa@garbagecollect.jp"] - - spec.summary = %q{Provides an interface to the Windows Registry in Ruby} - spec.description = spec.summary - spec.homepage = "https://github.com/ruby/win32-registry" - spec.required_ruby_version = ">= 2.6.0" - - spec.metadata["homepage_uri"] = spec.homepage - spec.metadata["source_code_uri"] = spec.homepage - - # Specify which files should be added to the gem when it is released. - # The `git ls-files -z` loads the files in the RubyGem that have been added into git. - excludes = %w[ - bin/ test/ spec/ features/ rakelib/ - .git* .mailmap appveyor Rakefile Gemfile - ] - git_files = %w[git ls-files -z --] + excludes.map {|x| ":^/#{x}"} - spec.files = IO.popen(git_files, chdir: __dir__, &:read).split("\x0") - spec.bindir = "exe" - spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) } - spec.require_paths = ["lib"] - - spec.add_dependency "fiddle", "~> 1.0" -end diff --git a/gc/default/default.c b/gc/default/default.c index 9771af004eccc3..57d3f5b0da247c 100644 --- a/gc/default/default.c +++ b/gc/default/default.c @@ -472,7 +472,7 @@ typedef struct rb_heap_struct { uintptr_t compact_cursor_index; struct heap_page *pooled_pages; size_t total_pages; /* total page count in a heap */ - size_t total_slots; /* total slot count (about total_pages * HEAP_PAGE_OBJ_LIMIT) */ + size_t total_slots; /* total slot count */ } rb_heap_t; @@ -592,6 +592,7 @@ typedef struct rb_objspace { double gc_sweep_start_time; size_t total_allocated_objects_at_gc_start; size_t heap_used_at_gc_start; + size_t heap_total_slots_at_gc_start; /* basic statistics */ size_t count; @@ -700,7 +701,6 @@ enum { HEAP_PAGE_ALIGN = (1UL << HEAP_PAGE_ALIGN_LOG), HEAP_PAGE_ALIGN_MASK = (~(~0UL << HEAP_PAGE_ALIGN_LOG)), HEAP_PAGE_SIZE = HEAP_PAGE_ALIGN, - HEAP_PAGE_OBJ_LIMIT = (unsigned int)((HEAP_PAGE_SIZE - sizeof(struct heap_page_header)) / BASE_SLOT_SIZE), HEAP_PAGE_BITMAP_LIMIT = CEILDIV(CEILDIV(HEAP_PAGE_SIZE, BASE_SLOT_SIZE), BITS_BITLENGTH), HEAP_PAGE_BITMAP_SIZE = (BITS_SIZE * HEAP_PAGE_BITMAP_LIMIT), }; @@ -5454,8 +5454,13 @@ gc_marks_finish(rb_objspace_t *objspace) max_free_slots = total_init_slots; } + /* Approximate freeable pages using the average slots-per-pages across all heaps */ if (sweep_slots > max_free_slots) { - heap_pages_freeable_pages = (sweep_slots - max_free_slots) / HEAP_PAGE_OBJ_LIMIT; + size_t excess_slots = sweep_slots - max_free_slots; + size_t total_heap_pages = heap_eden_total_pages(objspace); + heap_pages_freeable_pages = total_heap_pages > 0 + ? excess_slots * total_heap_pages / total_slots + : 0; } else { heap_pages_freeable_pages = 0; @@ -6500,6 +6505,7 @@ gc_start(rb_objspace_t *objspace, unsigned int reason) objspace->profile.latest_gc_info = reason; objspace->profile.total_allocated_objects_at_gc_start = total_allocated_objects(objspace); objspace->profile.heap_used_at_gc_start = rb_darray_size(objspace->heap_pages.sorted); + objspace->profile.heap_total_slots_at_gc_start = objspace_available_slots(objspace); objspace->profile.weak_references_count = 0; gc_prof_setup_new_record(objspace, reason); gc_reset_malloc_info(objspace, do_full_mark); @@ -8655,7 +8661,7 @@ gc_prof_set_heap_info(rb_objspace_t *objspace) if (gc_prof_enabled(objspace)) { gc_profile_record *record = gc_prof_record(objspace); size_t live = objspace->profile.total_allocated_objects_at_gc_start - total_freed_objects(objspace); - size_t total = objspace->profile.heap_used_at_gc_start * HEAP_PAGE_OBJ_LIMIT; + size_t total = objspace->profile.heap_total_slots_at_gc_start; #if GC_PROFILE_MORE_DETAIL record->heap_use_pages = objspace->profile.heap_used_at_gc_start; @@ -9551,7 +9557,6 @@ rb_gc_impl_init(void) rb_hash_aset(gc_constants, ID2SYM(rb_intern("BASE_SLOT_SIZE")), SIZET2NUM(BASE_SLOT_SIZE - RVALUE_OVERHEAD)); rb_hash_aset(gc_constants, ID2SYM(rb_intern("RBASIC_SIZE")), SIZET2NUM(sizeof(struct RBasic))); rb_hash_aset(gc_constants, ID2SYM(rb_intern("RVALUE_OVERHEAD")), SIZET2NUM(RVALUE_OVERHEAD)); - rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_OBJ_LIMIT")), SIZET2NUM(HEAP_PAGE_OBJ_LIMIT)); rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_BITMAP_SIZE")), SIZET2NUM(HEAP_PAGE_BITMAP_SIZE)); rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_PAGE_SIZE")), SIZET2NUM(HEAP_PAGE_SIZE)); rb_hash_aset(gc_constants, ID2SYM(rb_intern("HEAP_COUNT")), LONG2FIX(HEAP_COUNT)); diff --git a/gems/bundled_gems b/gems/bundled_gems index 6f0ac6c5e53d70..d27f29682153b0 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -38,9 +38,10 @@ pstore 0.2.1 https://github.com/ruby/pstore benchmark 0.5.0 https://github.com/ruby/benchmark logger 1.7.0 https://github.com/ruby/logger rdoc 7.2.0 https://github.com/ruby/rdoc -win32ole 1.9.2 https://github.com/ruby/win32ole +win32ole 1.9.3 https://github.com/ruby/win32ole irb 1.17.0 https://github.com/ruby/irb reline 0.6.3 https://github.com/ruby/reline readline 0.0.4 https://github.com/ruby/readline fiddle 1.1.8 https://github.com/ruby/fiddle tsort 0.2.0 https://github.com/ruby/tsort +win32-registry 0.1.2 https://github.com/ruby/win32-registry diff --git a/io_buffer.c b/io_buffer.c index 4bb4685e744d99..cb35141f47a883 100644 --- a/io_buffer.c +++ b/io_buffer.c @@ -1424,6 +1424,17 @@ rb_io_buffer_try_unlock(VALUE self) return 0; } +static VALUE +rb_io_buffer_locked_ensure(VALUE self) +{ + struct rb_io_buffer *buffer = NULL; + TypedData_Get_Struct(self, struct rb_io_buffer, &rb_io_buffer_type, buffer); + + buffer->flags &= ~RB_IO_BUFFER_LOCKED; + + return Qnil; +} + /* * call-seq: locked { ... } * @@ -1466,11 +1477,7 @@ rb_io_buffer_locked(VALUE self) buffer->flags |= RB_IO_BUFFER_LOCKED; - VALUE result = rb_yield(self); - - buffer->flags &= ~RB_IO_BUFFER_LOCKED; - - return result; + return rb_ensure(rb_yield, self, rb_io_buffer_locked_ensure, self); } /* diff --git a/lib/bundler/rubygems_gem_installer.rb b/lib/bundler/rubygems_gem_installer.rb index 64ce6193d3d1f5..12405869787360 100644 --- a/lib/bundler/rubygems_gem_installer.rb +++ b/lib/bundler/rubygems_gem_installer.rb @@ -71,9 +71,6 @@ def ensure_writable_dir(dir) def generate_plugins return unless Gem::Installer.method_defined?(:generate_plugins, false) - latest = Gem::Specification.stubs_for(spec.name).first - return if latest && latest.version > spec.version - ensure_writable_dir @plugins_dir if spec.plugins.empty? diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb index aea8c0d7deadd8..a5eb521a532419 100644 --- a/lib/rubygems/commands/environment_command.rb +++ b/lib/rubygems/commands/environment_command.rb @@ -38,6 +38,7 @@ def description # :nodoc: :verbose: Verbosity of the gem command. false, true, and :really are the levels :update_sources: Enable/disable automatic updating of repository metadata + :concurrent_downloads: The number of gem downloads to perform concurrently :backtrace: Print backtrace when RubyGems encounters an error :gempath: The paths in which to look for gems :disable_default_gem_server: Force specification of gem server host on push diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb index d34480f4743871..06ca73157a1916 100644 --- a/lib/rubygems/config_file.rb +++ b/lib/rubygems/config_file.rb @@ -220,7 +220,8 @@ def initialize(args) @hash.transform_keys! do |k| # gemhome and gempath are not working with symbol keys if %w[backtrace bulk_threshold verbose update_sources cert_expiration_length_days - install_extension_in_lib ipv4_fallback_enabled global_gem_cache sources + concurrent_downloads install_extension_in_lib ipv4_fallback_enabled + global_gem_cache sources disable_default_gem_server ssl_verify_mode ssl_ca_cert ssl_client_cert].include?(k) k.to_sym else @@ -233,7 +234,7 @@ def initialize(args) @bulk_threshold = @hash[:bulk_threshold] if @hash.key? :bulk_threshold @verbose = @hash[:verbose] if @hash.key? :verbose @update_sources = @hash[:update_sources] if @hash.key? :update_sources - # TODO: We should handle concurrent_downloads same as other options + @concurrent_downloads = @hash[:concurrent_downloads] if @hash.key? :concurrent_downloads @cert_expiration_length_days = @hash[:cert_expiration_length_days] if @hash.key? :cert_expiration_length_days @install_extension_in_lib = @hash[:install_extension_in_lib] if @hash.key? :install_extension_in_lib @ipv4_fallback_enabled = @hash[:ipv4_fallback_enabled] if @hash.key? :ipv4_fallback_enabled diff --git a/range.c b/range.c index 36afdfa7619005..c3b3813cb1eef7 100644 --- a/range.c +++ b/range.c @@ -2611,12 +2611,12 @@ range_overlap(VALUE range, VALUE other) * * - Method Range.new: * - * # Ranges that by default include the given end value. - * Range.new(1, 4).to_a # => [1, 2, 3, 4] - * Range.new('a', 'd').to_a # => ["a", "b", "c", "d"] - * # Ranges that use third argument +exclude_end+ to exclude the given end value. - * Range.new(1, 4, true).to_a # => [1, 2, 3] - * Range.new('a', 'd', true).to_a # => ["a", "b", "c"] + * # Ranges that by default include the given end value. + * Range.new(1, 4).to_a # => [1, 2, 3, 4] + * Range.new('a', 'd').to_a # => ["a", "b", "c", "d"] + * # Ranges that use third argument +exclude_end+ to exclude the given end value. + * Range.new(1, 4, true).to_a # => [1, 2, 3] + * Range.new('a', 'd', true).to_a # => ["a", "b", "c"] * * == Beginless Ranges * diff --git a/spec/bundled_gems_spec.rb b/spec/bundled_gems_spec.rb index c6a5be406afc0f..0c9b45a4ad66dd 100644 --- a/spec/bundled_gems_spec.rb +++ b/spec/bundled_gems_spec.rb @@ -22,7 +22,6 @@ def self.ruby=(ruby) Gem.ruby = ENV["RUBY"] if ENV["RUBY"] require_relative "bundler/support/rubygems_ext" - Spec::Rubygems.test_setup Spec::Helpers.install_dev_bundler FileUtils.mkdir_p Spec::Path.gem_path end diff --git a/string.c b/string.c index 6b8cdf240d4192..0fd3ef17b40e00 100644 --- a/string.c +++ b/string.c @@ -164,7 +164,7 @@ VALUE rb_cSymbol; if (str_embed_capa(str) < capacity + termlen) {\ char *const tmp = ALLOC_N(char, (size_t)(capacity) + (termlen));\ const long tlen = RSTRING_LEN(str);\ - memcpy(tmp, RSTRING_PTR(str), tlen);\ + memcpy(tmp, RSTRING_PTR(str), str_embed_capa(str));\ RSTRING(str)->as.heap.ptr = tmp;\ RSTRING(str)->len = tlen;\ STR_SET_NOEMBED(str);\ diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index 09199c34b1c3cc..09bface652d50b 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -694,7 +694,6 @@ def allocate_large_object = Array.new(10) end def test_gc_internals - assert_not_nil GC::INTERNAL_CONSTANTS[:HEAP_PAGE_OBJ_LIMIT] assert_not_nil GC::INTERNAL_CONSTANTS[:BASE_SLOT_SIZE] end diff --git a/test/ruby/test_io_buffer.rb b/test/ruby/test_io_buffer.rb index 706ce16c42a547..e272b8a71c7112 100644 --- a/test/ruby/test_io_buffer.rb +++ b/test/ruby/test_io_buffer.rb @@ -930,4 +930,34 @@ def test_integer_endianness_swapping assert_equal value, round_trip_value, "#{le_type}/#{be_type}: double-swap should restore original value" end end + + class Bug21882 < RuntimeError; end + def test_locked_exception + buf = IO::Buffer.new(10) + assert_raise(Bug21882, '#locked should propagate exception') do + buf.locked { raise Bug21882 } + end + + # should be unlocked now and can be locked again + refute_predicate buf, :locked? + buf.locked { } + end + + def test_locked_break + buf = IO::Buffer.new(10) + assert_equal :ok, (buf.locked { break :ok }) + + # should be unlocked now and can be locked again + refute_predicate buf, :locked? + buf.locked { } + end + + def test_locked_throw + buf = IO::Buffer.new(10) + assert_equal :ok, (catch(:bug21882) { buf.locked { throw :bug21882, :ok } }) + + # should be unlocked now and can be locked again + refute_predicate buf, :locked? + buf.locked { } + end end diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb index 48252d84d4e49b..e27de544c6f596 100644 --- a/test/rubygems/test_gem_commands_environment_command.rb +++ b/test/rubygems/test_gem_commands_environment_command.rb @@ -164,4 +164,8 @@ def test_execute_platform assert_equal "#{Gem.platforms.join File::PATH_SEPARATOR}\n", @ui.output assert_equal "", @ui.error end + + def test_description_mentions_concurrent_downloads + assert_match(/:concurrent_downloads:/, @cmd.description) + end end diff --git a/test/rubygems/test_gem_config_file.rb b/test/rubygems/test_gem_config_file.rb index 6ed51f2704b8b6..b38628fdc4d85c 100644 --- a/test/rubygems/test_gem_config_file.rb +++ b/test/rubygems/test_gem_config_file.rb @@ -113,6 +113,16 @@ def test_initialize_global_gem_cache_gemrc assert_equal true, @cfg.global_gem_cache end + def test_initialize_concurrent_downloads + File.open @temp_conf, "w" do |fp| + fp.puts "concurrent_downloads: 2" + end + + util_config_file %W[--config-file #{@temp_conf}] + + assert_equal 2, @cfg.concurrent_downloads + end + def test_initialize_handle_arguments_config_file util_config_file %W[--config-file #{@temp_conf}] diff --git a/test/win32/test_registry.rb b/test/win32/test_registry.rb deleted file mode 100644 index 9a38d0d314cff9..00000000000000 --- a/test/win32/test_registry.rb +++ /dev/null @@ -1,256 +0,0 @@ -# frozen_string_literal: true - -require "rbconfig" - -if /mswin|mingw|cygwin/ =~ RbConfig::CONFIG['host_os'] - begin - require 'win32/registry' - rescue LoadError - else - require 'test/unit' - end -end - -if defined?(Win32::Registry) - class TestWin32Registry < Test::Unit::TestCase - COMPUTERNAME = 'SYSTEM\\CurrentControlSet\\Control\\ComputerName\\ComputerName' - TEST_REGISTRY_PATH = 'Volatile Environment' - TEST_REGISTRY_KEY = 'ruby-win32-registry-test-' - - # Create a new registry key per test in an atomic way, which is deleted on teardown. - # - # Fills the following instance variables: - # - # @test_registry_key - A registry path which is not yet created, - # but can be created without collisions even when running - # multiple test processes. - # @test_registry_rnd - The part of the registry path with a random number. - # @createopts - Required parameters (desired, opt) for create method in - # the volatile environment of the registry. - def setup - @createopts = [Win32::Registry::KEY_ALL_ACCESS, Win32::Registry::REG_OPTION_VOLATILE] - 100.times do |i| - k = TEST_REGISTRY_KEY.gsub("", i.to_s) - next unless Win32::Registry::HKEY_CURRENT_USER.create( - TEST_REGISTRY_PATH + "\\" + k, - *@createopts - ).created? - @test_registry_key = TEST_REGISTRY_PATH + "\\" + k + "\\" + "test\\" - @test_registry_rnd = k - break - end - omit "Unused registry subkey not found in #{TEST_REGISTRY_KEY}" unless @test_registry_key - end - - def teardown - Win32::Registry::HKEY_CURRENT_USER.open(TEST_REGISTRY_PATH) do |reg| - reg.delete_key @test_registry_rnd, true - end - end - - def test_predefined - assert_predefined_key Win32::Registry::HKEY_CLASSES_ROOT - assert_predefined_key Win32::Registry::HKEY_CURRENT_USER - assert_predefined_key Win32::Registry::HKEY_LOCAL_MACHINE - assert_predefined_key Win32::Registry::HKEY_USERS - assert_predefined_key Win32::Registry::HKEY_PERFORMANCE_DATA - assert_predefined_key Win32::Registry::HKEY_PERFORMANCE_TEXT - assert_predefined_key Win32::Registry::HKEY_PERFORMANCE_NLSTEXT - assert_predefined_key Win32::Registry::HKEY_CURRENT_CONFIG - assert_predefined_key Win32::Registry::HKEY_DYN_DATA - end - - def test_open_no_block - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts).close - - reg = Win32::Registry::HKEY_CURRENT_USER.open(@test_registry_key, Win32::Registry::KEY_ALL_ACCESS) - assert_kind_of Win32::Registry, reg - assert_equal true, reg.open? - assert_equal false, reg.created? - reg["test"] = "abc" - reg.close - assert_raise(Win32::Registry::Error) do - reg["test"] = "abc" - end - end - - def test_open_with_block - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts).close - - regs = [] - Win32::Registry::HKEY_CURRENT_USER.open(@test_registry_key, Win32::Registry::KEY_ALL_ACCESS) do |reg| - regs << reg - assert_equal true, reg.open? - assert_equal false, reg.created? - reg["test"] = "abc" - end - - assert_equal 1, regs.size - assert_kind_of Win32::Registry, regs[0] - assert_raise(Win32::Registry::Error) do - regs[0]["test"] = "abc" - end - end - - def test_class_open - name1, keys1 = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, "SYSTEM") do |reg| - assert_predicate reg, :open? - [reg.name, reg.keys] - end - name2, keys2 = Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM") do |reg| - assert_predicate reg, :open? - [reg.name, reg.keys] - end - assert_equal name1, name2 - assert_equal keys1, keys2 - end - - def test_read - computername = ENV['COMPUTERNAME'] - Win32::Registry::HKEY_LOCAL_MACHINE.open(COMPUTERNAME) do |reg| - assert_equal computername, reg['ComputerName'] - assert_equal [Win32::Registry::REG_SZ, computername], reg.read('ComputerName') - assert_raise(TypeError) {reg.read('ComputerName', Win32::Registry::REG_DWORD)} - end - end - - def test_create_no_block - reg = Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) - assert_kind_of Win32::Registry, reg - assert_equal true, reg.open? - assert_equal true, reg.created? - reg["test"] = "abc" - reg.close - assert_equal false, reg.open? - assert_raise(Win32::Registry::Error) do - reg["test"] = "abc" - end - end - - def test_create_with_block - regs = [] - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - regs << reg - reg["test"] = "abc" - assert_equal true, reg.open? - assert_equal true, reg.created? - end - - assert_equal 1, regs.size - assert_kind_of Win32::Registry, regs[0] - assert_equal false, regs[0].open? - assert_raise(Win32::Registry::Error) do - regs[0]["test"] = "abc" - end - end - - def test_write - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - reg.write_s("key1", "data") - assert_equal [Win32::Registry::REG_SZ, "data"], reg.read("key1") - reg.write_i("key2", 0x5fe79027) - assert_equal [Win32::Registry::REG_DWORD, 0x5fe79027], reg.read("key2") - end - end - - def test_accessors - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - assert_kind_of Integer, reg.hkey - assert_kind_of Win32::Registry, reg.parent - assert_equal "HKEY_CURRENT_USER", reg.parent.name - assert_equal "Volatile Environment\\#{@test_registry_rnd}\\test\\", reg.keyname - assert_equal Win32::Registry::REG_CREATED_NEW_KEY, reg.disposition - end - end - - def test_name - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - assert_equal "HKEY_CURRENT_USER\\Volatile Environment\\#{@test_registry_rnd}\\test\\", reg.name - end - end - - def test_keys - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - reg.create("key1", *@createopts) - assert_equal ["key1"], reg.keys - end - end - - def test_each_key - keys = [] - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - reg.create("key1", *@createopts) - reg.each_key { |*a| keys << a } - end - assert_equal [2], keys.map(&:size) - assert_equal ["key1"], keys.map(&:first) - assert_in_delta Win32::Registry.time2wtime(Time.now), keys[0][1], 10_000_000_000, "wtime should roughly match Time.now" - end - - def test_each_key_enum - keys = nil - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - reg.create("key1", *@createopts) - reg.create("key2", *@createopts) - reg.create("key3", *@createopts) - reg["value1"] = "abcd" - keys = reg.each_key.to_a - end - assert_equal 3, keys.size - assert_equal [2, 2, 2], keys.map(&:size) - assert_equal ["key1", "key2", "key3"], keys.map(&:first) - end - - def test_values - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - reg.create("key1", *@createopts) - reg["value1"] = "abcd" - assert_equal ["abcd"], reg.values - end - end - - def test_each_value - vals = [] - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - reg.create("key1", *@createopts) - reg["value1"] = "abcd" - reg.each_value { |*a| vals << a } - end - assert_equal [["value1", Win32::Registry::REG_SZ, "abcd"]], vals - end - - def test_each_value_enum - vals = nil - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - reg.create("key1", *@createopts) - reg["value1"] = "abcd" - reg["value2"] = 42 - vals = reg.each_value.to_a - end - assert_equal [["value1", Win32::Registry::REG_SZ, "abcd"], - ["value2", Win32::Registry::REG_DWORD, 42]], vals - end - - def test_utf8_encoding - keys = [] - Win32::Registry::HKEY_CURRENT_USER.create(@test_registry_key, *@createopts) do |reg| - reg.create("abc EUR", *@createopts) - reg.create("abc €", *@createopts) - reg.each_key do |subkey| - keys << subkey - end - end - - assert_equal [Encoding::UTF_8] * 2, keys.map(&:encoding) - assert_equal ["abc EUR", "abc €"], keys - end - - private - - def assert_predefined_key(key) - assert_kind_of Win32::Registry, key - assert_predicate key, :open? - refute_predicate key, :created? - end - end -end diff --git a/tool/lib/_tmpdir.rb b/tool/lib/_tmpdir.rb index 1518d46ee585cf..a3b0739d85415c 100644 --- a/tool/lib/_tmpdir.rb +++ b/tool/lib/_tmpdir.rb @@ -28,7 +28,7 @@ Dir.rmdir(tmpdir) rescue Errno::ENOENT rescue Errno::ENOTEMPTY - unless $no_report_tmpdir + unless $no_report_tmpdir ||= nil require_relative "colorize" colorize = Colorize.new ls = Struct.new(:colorize) do diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 477cc755462d2c..e0a896c915c6d1 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -107,11 +107,6 @@ def lib((upstream, branch), gemspec_in_subdir: false) ["net-protocol.gemspec", "lib/net/net-protocol.gemspec"], ]), "open-uri": lib("ruby/open-uri"), - "win32-registry": repo("ruby/win32-registry", [ - ["lib/win32/registry.rb", "ext/win32/lib/win32/registry.rb"], - ["test/win32/test_registry.rb", "test/win32/test_registry.rb"], - ["win32-registry.gemspec", "ext/win32/win32-registry.gemspec"], - ]), English: lib("ruby/English"), cgi: repo("ruby/cgi", [ ["ext/cgi", "ext/cgi"], diff --git a/util.c b/util.c index 4caa324849af31..3315eb575e1a28 100644 --- a/util.c +++ b/util.c @@ -529,45 +529,43 @@ ruby_strdup(const char *str) char * ruby_getcwd(void) { - VALUE guard = rb_imemo_tmpbuf_new(); int size = 200; char *buf = xmalloc(size); while (!getcwd(buf, size)) { int e = errno; if (e != ERANGE) { - rb_free_tmp_buffer(&guard); + xfree(buf); rb_syserr_fail(e, "getcwd"); } size *= 2; - rb_imemo_tmpbuf_set_ptr(guard, buf); - buf = xrealloc(buf, size); + xfree(buf); + buf = xmalloc(size); } - rb_imemo_tmpbuf_set_ptr(guard, NULL); return buf; } # else -static const rb_data_type_t getcwd_buffer_guard_type = { - .wrap_struct_name = "ruby_getcwd_guard", - .function = { - .dfree = free // not xfree. - }, - .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED -}; +static VALUE +getcwd_strdup(VALUE arg) +{ + return (VALUE)ruby_strdup((const char *)arg); +} + +static VALUE +getcwd_free(VALUE arg) +{ + free((void *)arg); + return Qnil; +} char * ruby_getcwd(void) { - VALUE guard = TypedData_Wrap_Struct((VALUE)0, &getcwd_buffer_guard_type, NULL); - char *buf, *cwd = getcwd(NULL, 0); - RTYPEDDATA_DATA(guard) = cwd; + char *cwd = getcwd(NULL, 0); if (!cwd) rb_sys_fail("getcwd"); - buf = ruby_strdup(cwd); /* allocate by xmalloc */ - free(cwd); - RTYPEDDATA_DATA(RB_GC_GUARD(guard)) = NULL; - return buf; + return (char *)rb_ensure(getcwd_strdup, (VALUE)cwd, getcwd_free, (VALUE)cwd); } # endif diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 80f8f5c2bf88a4..1115dd60c0d99f 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1416,7 +1416,6 @@ RUBYSPEC_CAPIEXT_EXTS = $(RUBYSPEC_CAPIEXT_EXTS): $(RUBYSPEC_CAPIEXT_DEPS) rubyspec-capiext: $(RUBYSPEC_CAPIEXT_EXTS) - @ $(NULLCMD) {$(RUBYSPEC_CAPIEXT_SRCDIR)}.c{$(RUBYSPEC_CAPIEXT)}.so: $(ECHO) building $(@F) diff --git a/zjit.rb b/zjit.rb index 7c515c391b95c6..ce489aaf932e0b 100644 --- a/zjit.rb +++ b/zjit.rb @@ -177,6 +177,9 @@ def stats_string if stats[:code_region_bytes]&.nonzero? stats[:side_exit_size_ratio] = stats[:side_exit_size].to_f / stats[:code_region_bytes] * 100 end + if stats[:compile_time_ns]&.nonzero? + stats[:compile_side_exit_time_ratio] = stats[:compile_side_exit_time_ns].to_f / stats[:compile_time_ns] * 100 + end # Show counters independent from exit_* or dynamic_send_* print_counters_with_prefix(prefix: 'not_inlined_cfuncs_', prompt: 'not inlined C methods', buf:, stats:, limit: 20) @@ -226,6 +229,15 @@ def stats_string :failed_iseq_count, :compile_time_ns, + :compile_side_exit_time_ns, + :compile_side_exit_time_ratio, + :compile_hir_time_ns, + :compile_hir_build_time_ns, + :compile_hir_strength_reduce_time_ns, + :compile_hir_fold_constants_time_ns, + :compile_hir_clean_cfg_time_ns, + :compile_hir_eliminate_dead_code_time_ns, + :compile_lir_time_ns, :profile_time_ns, :gc_time_ns, :invalidation_time_ns, @@ -296,7 +308,7 @@ def print_counters(keys, buf:, stats:, right_align: false, base: nil) case key when :ratio_in_zjit value = '%0.1f%%' % value - when :guard_type_exit_ratio, :guard_shape_exit_ratio, :side_exit_size_ratio + when :guard_type_exit_ratio, :guard_shape_exit_ratio, :side_exit_size_ratio, :compile_side_exit_time_ratio value = '%0.1f%%' % value when /_time_ns\z/ key = key.to_s.sub(/_time_ns\z/, '_time') diff --git a/zjit/src/backend/lir.rs b/zjit/src/backend/lir.rs index f8590b1049f150..de3e55ac000c88 100644 --- a/zjit/src/backend/lir.rs +++ b/zjit/src/backend/lir.rs @@ -2291,6 +2291,9 @@ impl Assembler }); } + // Measure time spent compiling side-exit LIR + let side_exit_start = std::time::Instant::now(); + for ((block_id, idx), target) in targets { // Compile a side exit. Note that this is past the split pass and alloc_regs(), // so you can't use an instruction that returns a VReg. @@ -2353,6 +2356,12 @@ impl Assembler *self.basic_blocks[block_id].insns[idx].target_mut().unwrap() = counted_exit.unwrap_or(compiled_exit); } } + + // Measure time spent compiling side-exit LIR + if !compiled_exits.is_empty() { + let nanos = side_exit_start.elapsed().as_nanos(); + crate::stats::incr_counter_by(crate::stats::Counter::compile_side_exit_time_ns, nanos as u64); + } } } diff --git a/zjit/src/codegen.rs b/zjit/src/codegen.rs index 845f7e6eefbb2b..0d7c70d5971dae 100644 --- a/zjit/src/codegen.rs +++ b/zjit/src/codegen.rs @@ -133,9 +133,9 @@ fn gen_iseq_entry_point(cb: &mut CodeBlock, iseq: IseqPtr, jit_exception: bool) } // Compile ISEQ into High-level IR - let function = compile_iseq(iseq).inspect_err(|_| { + let function = crate::stats::with_time_stat(Counter::compile_hir_time_ns, || compile_iseq(iseq).inspect_err(|_| { incr_counter!(failed_iseq_count); - })?; + }))?; // Compile the High-level IR let IseqCodePtrs { start_ptr, .. } = gen_iseq(cb, iseq, Some(&function)).inspect_err(|err| { @@ -247,11 +247,12 @@ fn gen_iseq_body(cb: &mut CodeBlock, iseq: IseqPtr, mut version: IseqVersionRef, // Convert ISEQ into optimized High-level IR if not given let function = match function { Some(function) => function, - None => &compile_iseq(iseq)?, + None => &crate::stats::with_time_stat(Counter::compile_hir_time_ns, || compile_iseq(iseq))?, }; // Compile the High-level IR - let (iseq_code_ptrs, gc_offsets, iseq_calls) = gen_function(cb, iseq, version, function)?; + let (iseq_code_ptrs, gc_offsets, iseq_calls) = + crate::stats::with_time_stat(Counter::compile_lir_time_ns, || gen_function(cb, iseq, version, function))?; // Stub callee ISEQs for JIT-to-JIT calls for iseq_call in iseq_calls.iter() { @@ -279,12 +280,16 @@ fn gen_function(cb: &mut CodeBlock, iseq: IseqPtr, version: IseqVersionRef, func // Create all LIR basic blocks corresponding to HIR basic blocks for (rpo_idx, &block_id) in reverse_post_order.iter().enumerate() { + // Skip the entries superblock — it's an internal CFG artifact + if block_id == function.entries_block { continue; } let lir_block_id = asm.new_block(block_id, function.is_entry_block(block_id), rpo_idx); hir_to_lir[block_id.0] = Some(lir_block_id); } // Compile each basic block for (rpo_idx, &block_id) in reverse_post_order.iter().enumerate() { + // Skip the entries superblock — it's an internal CFG artifact + if block_id == function.entries_block { continue; } // Set the current block to the LIR block that corresponds to this // HIR block. let lir_block_id = hir_to_lir[block_id.0].unwrap(); @@ -311,6 +316,16 @@ fn gen_function(cb: &mut CodeBlock, iseq: IseqPtr, version: IseqVersionRef, func } } + // In JIT entry blocks, compile LoadArg instructions before other instructions + // so that calling convention registers are reserved early, like Param. + if function.is_entry_block(block_id) { + for &insn_id in block.insns() { + if let Insn::LoadArg { idx, .. } = function.find(insn_id) { + jit.opnds[insn_id.0] = Some(gen_param(&mut asm, idx as usize)); + } + } + } + // Compile all instructions for &insn_id in block.insns() { let insn = function.find(insn_id); @@ -481,6 +496,7 @@ fn gen_insn(cb: &mut CodeBlock, jit: &mut JITState, asm: &mut Assembler, functio Insn::StringIntern { val, state } => gen_intern(asm, opnd!(val), &function.frame_state(*state)), Insn::ToRegexp { opt, values, state } => gen_toregexp(jit, asm, *opt, opnds!(values), &function.frame_state(*state)), Insn::Param => unreachable!("block.insns should not have Insn::Param"), + Insn::LoadArg { .. } => return Ok(()), // compiled in the LoadArg pre-pass above Insn::Snapshot { .. } => return Ok(()), // we don't need to do anything for this instruction at the moment &Insn::Send { cd, blockiseq: None, state, reason, .. } => gen_send_without_block(jit, asm, cd, &function.frame_state(state), reason), &Insn::Send { cd, blockiseq: Some(blockiseq), state, reason, .. } => gen_send(jit, asm, cd, blockiseq, &function.frame_state(state), reason), @@ -600,7 +616,7 @@ fn gen_insn(cb: &mut CodeBlock, jit: &mut JITState, asm: &mut Assembler, functio | &Insn::Throw { state, .. } => return Err(state), &Insn::IfFalse { .. } | Insn::IfTrue { .. } - | &Insn::Jump { .. } => unreachable!(), + | &Insn::Jump { .. } | Insn::Entries { .. } => unreachable!(), }; assert!(insn.has_output(), "Cannot write LIR output of HIR instruction with no output: {insn}"); @@ -2630,7 +2646,8 @@ fn compile_iseq(iseq: IseqPtr) -> Result { return Err(CompileError::IseqStackTooLarge); } - let mut function = match iseq_to_hir(iseq) { + let hir = crate::stats::with_time_stat(Counter::compile_hir_build_time_ns, || iseq_to_hir(iseq)); + let mut function = match hir { Ok(function) => function, Err(err) => { debug!("ZJIT: iseq_to_hir: {err:?}: {}", iseq_get_location(iseq, 0)); diff --git a/zjit/src/hir.rs b/zjit/src/hir.rs index c43be0e1003f6b..1fb526e569f46d 100644 --- a/zjit/src/hir.rs +++ b/zjit/src/hir.rs @@ -732,6 +732,13 @@ pub enum Insn { Const { val: Const }, /// SSA block parameter. Also used for function parameters in the function's entry block. Param, + /// Load a function argument from the calling convention. + /// Used in JIT entry blocks. idx is the calling convention index, id is for display. + LoadArg { idx: u32, id: ID, val_type: Type }, + + /// Synthetic terminator for the entries superblock. Targets all entry blocks + /// so that CFG analyses see a single root. Not lowered to machine code. + Entries { targets: Vec }, StringCopy { val: InsnId, chilled: bool, state: InsnId }, StringIntern { val: InsnId, state: InsnId }, @@ -1056,6 +1063,7 @@ impl Insn { pub fn has_output(&self) -> bool { match self { Insn::Jump(_) + | Insn::Entries { .. } | Insn::IfTrue { .. } | Insn::IfFalse { .. } | Insn::EntryPoint { .. } | Insn::Return { .. } | Insn::PatchPoint { .. } | Insn::SetIvar { .. } | Insn::SetClassVar { .. } | Insn::ArrayExtend { .. } | Insn::ArrayPush { .. } | Insn::SideExit { .. } | Insn::SetGlobal { .. } @@ -1070,7 +1078,15 @@ impl Insn { /// Return true if the instruction ends a basic block and false otherwise. pub fn is_terminator(&self) -> bool { match self { - Insn::Jump(_) | Insn::Return { .. } | Insn::SideExit { .. } | Insn::Throw { .. } => true, + Insn::Jump(_) | Insn::Entries { .. } | Insn::Return { .. } | Insn::SideExit { .. } | Insn::Throw { .. } => true, + _ => false, + } + } + + /// Return true if the instruction is a jump (has successor blocks in the CFG). + pub fn is_jump(&self) -> bool { + match self { + Insn::IfTrue { .. } | Insn::IfFalse { .. } | Insn::Jump(_) | Insn::Entries { .. } => true, _ => false, } } @@ -1086,6 +1102,7 @@ impl Insn { match &self { Insn::Const { .. } => effects::Empty, Insn::Param { .. } => effects::Empty, + Insn::LoadArg { .. } => effects::Empty, Insn::StringCopy { .. } => allocates, Insn::StringIntern { .. } => effects::Any, Insn::StringConcat { .. } => effects::Any, @@ -1227,6 +1244,7 @@ impl Insn { Insn::InvokeProc { .. } => effects::Any, Insn::RefineType { .. } => effects::Empty, Insn::HasType { .. } => effects::Empty, + Insn::Entries { .. } => effects::Any, } } @@ -1304,6 +1322,16 @@ impl<'a> std::fmt::Display for InsnPrinter<'a> { match &self.inner { Insn::Const { val } => { write!(f, "Const {}", val.print(self.ptr_map)) } Insn::Param => { write!(f, "Param") } + Insn::LoadArg { idx, id, .. } => { write!(f, "LoadArg :{}@{idx}", id.contents_lossy()) } + Insn::Entries { targets } => { + write!(f, "Entries")?; + let mut prefix = " "; + for target in targets { + write!(f, "{prefix}{target}")?; + prefix = ", "; + } + Ok(()) + } Insn::NewArray { elements, .. } => { write!(f, "NewArray")?; let mut prefix = " "; @@ -1922,6 +1950,8 @@ pub struct Function { union_find: std::cell::RefCell>, insn_types: Vec, blocks: Vec, + /// Superblock that targets all entry blocks. The sole root for RPO/dominator computation. + pub entries_block: BlockId, /// Entry block for the interpreter entry_block: BlockId, /// Entry block for JIT-to-JIT calls. Length will be `opt_num+1`, for callers @@ -2021,8 +2051,9 @@ impl Function { insns: vec![], insn_types: vec![], union_find: UnionFind::new().into(), - blocks: vec![Block::default()], - entry_block: BlockId(0), + blocks: vec![Block::default(), Block::default()], + entries_block: BlockId(0), + entry_block: BlockId(1), jit_entry_blocks: vec![], param_types: vec![], profiles: None, @@ -2182,6 +2213,8 @@ impl Function { match &self.insns[insn_id.0] { result@(Const {..} | Param + | LoadArg {..} + | Entries {..} | GetConstantPath {..} | PatchPoint {..} | PutSpecialObject {..} @@ -2420,7 +2453,8 @@ impl Function { assert!(self.insns[insn.0].has_output()); match &self.insns[insn.0] { Insn::Param => unimplemented!("params should not be present in block.insns"), - Insn::SetGlobal { .. } | Insn::Jump(_) | Insn::EntryPoint { .. } + Insn::LoadArg { val_type, .. } => *val_type, + Insn::SetGlobal { .. } | Insn::Jump(_) | Insn::Entries { .. } | Insn::EntryPoint { .. } | Insn::IfTrue { .. } | Insn::IfFalse { .. } | Insn::Return { .. } | Insn::Throw { .. } | Insn::PatchPoint { .. } | Insn::SetIvar { .. } | Insn::SetClassVar { .. } | Insn::ArrayExtend { .. } | Insn::ArrayPush { .. } | Insn::SideExit { .. } | Insn::SetLocal { .. } @@ -2605,10 +2639,8 @@ impl Function { }; } - for entry_block in self.entry_blocks() { - reachable.insert(entry_block); - worklist_add!(entry_block); - } + reachable.insert(self.entries_block); + worklist_add!(self.entries_block); // Helper to propagate types along a branch edge and enqueue the target if anything changed macro_rules! enqueue { @@ -2653,6 +2685,14 @@ impl Function { enqueue!(self, target); continue; } + Insn::Entries { targets } => { + for target in &targets { + if reachable.insert(*target) { + worklist_add!(*target); + } + } + continue; + } insn if insn.has_output() => self.infer_type(*insn_id), _ => continue, }; @@ -4597,6 +4637,8 @@ impl Function { match insn { &Insn::Const { .. } | &Insn::Param + | &Insn::LoadArg { .. } + | &Insn::Entries { .. } | &Insn::EntryPoint { .. } | &Insn::LoadPC | &Insn::LoadEC @@ -4922,8 +4964,16 @@ impl Function { let mut num_in_edges = vec![0; self.blocks.len()]; for block in self.rpo() { for &insn in &self.blocks[block.0].insns { - if let Insn::IfTrue { target, .. } | Insn::IfFalse { target, .. } | Insn::Jump(target) = self.find(insn) { - num_in_edges[target.target.0] += 1; + match self.find(insn) { + Insn::IfTrue { target, .. } | Insn::IfFalse { target, .. } | Insn::Jump(target) => { + num_in_edges[target.target.0] += 1; + } + Insn::Entries { ref targets } => { + for target in targets { + num_in_edges[target.0] += 1; + } + } + _ => {} } } } @@ -4958,14 +5008,21 @@ impl Function { self.entry_block == block_id || self.jit_entry_blocks.contains(&block_id) } + /// Populate the entries superblock with an Entries instruction targeting all entry blocks. + /// Must be called after all entry blocks have been created. + fn seal_entries(&mut self) { + let targets = self.entry_blocks(); + self.push_insn(self.entries_block, Insn::Entries { targets }); + } + /// Return a traversal of the `Function`'s `BlockId`s in reverse post-order. pub fn rpo(&self) -> Vec { - let mut result = self.po_from(self.entry_blocks()); + let mut result = self.po_from(self.entries_block); result.reverse(); result } - fn po_from(&self, starts: Vec) -> Vec { + fn po_from(&self, start: BlockId) -> Vec { #[derive(PartialEq)] enum Action { VisitEdges, @@ -4973,7 +5030,7 @@ impl Function { } let mut result = vec![]; let mut seen = BlockSet::with_capacity(self.blocks.len()); - let mut stack: Vec<_> = starts.iter().map(|&start| (start, Action::VisitEdges)).collect(); + let mut stack = vec![(start, Action::VisitEdges)]; while let Some((block, action)) = stack.pop() { if action == Action::VisitSelf { result.push(block); @@ -4982,9 +5039,20 @@ impl Function { if !seen.insert(block) { continue; } stack.push((block, Action::VisitSelf)); for insn_id in &self.blocks[block.0].insns { - let insn = self.find(*insn_id); - if let Insn::IfTrue { target, .. } | Insn::IfFalse { target, .. } | Insn::Jump(target) = insn { - stack.push((target.target, Action::VisitEdges)); + // Instructions without output, including branch instructions, can't be targets of + // make_equal_to, so we don't need find() here. + match &self.insns[insn_id.0] { + Insn::IfTrue { target, .. } | Insn::IfFalse { target, .. } | Insn::Jump(target) => { + stack.push((target.target, Action::VisitEdges)); + } + Insn::Entries { targets } => { + for target in targets { + stack.push((*target, Action::VisitEdges)); + } + } + _ => { + debug_assert!(!self.find(*insn_id).is_jump(), "Instruction {:?} should not be in union-find; it has no output", insn_id); + } } } } @@ -5136,9 +5204,28 @@ impl Function { let mut passes: Vec = Vec::new(); let should_dump = get_option!(dump_hir_iongraph); + macro_rules! ident_equal { + ($a:ident, $b:ident) => { stringify!($a) == stringify!($b) }; + } + macro_rules! run_pass { ($name:ident) => { - self.$name(); + // Bucket all strength reduction together + let counter = if ident_equal!($name, type_specialize) + || ident_equal!($name, inline) + || ident_equal!($name, optimize_getivar) + || ident_equal!($name, optimize_c_calls) { + Counter::compile_hir_strength_reduce_time_ns + } else if ident_equal!($name, fold_constants) { + Counter::compile_hir_fold_constants_time_ns + } else if ident_equal!($name, clean_cfg) { + Counter::compile_hir_clean_cfg_time_ns + } else if ident_equal!($name, eliminate_dead_code) { + Counter::compile_hir_eliminate_dead_code_time_ns + } else { + unimplemented!("Counter for pass {}", stringify!($name)); + }; + crate::stats::with_time_stat(counter, || self.$name()); #[cfg(debug_assertions)] self.assert_validates(); if should_dump { passes.push( @@ -5257,11 +5344,10 @@ impl Function { // missing location. let mut assigned_in = vec![None; self.num_blocks()]; let rpo = self.rpo(); - // Begin with every block having every variable defined, except for the entry blocks, which - // start with nothing defined. - let entry_blocks = self.entry_blocks(); + // Begin with every block having every variable defined, except for entries_block, which + // starts with nothing defined. for &block in &rpo { - if entry_blocks.contains(&block) { + if block == self.entries_block { assigned_in[block.0] = Some(InsnSet::with_capacity(self.insns.len())); } else { let mut all_ones = InsnSet::with_capacity(self.insns.len()); @@ -5270,7 +5356,7 @@ impl Function { } } let mut worklist = VecDeque::with_capacity(self.num_blocks()); - worklist.push_back(self.entry_block); + worklist.push_back(self.entries_block); while let Some(block) = worklist.pop_front() { let mut assigned = assigned_in[block.0].clone().unwrap(); for ¶m in &self.blocks[block.0].params { @@ -5288,6 +5374,17 @@ impl Function { worklist.push_back(target.target); } } + Insn::Entries { ref targets } => { + for &target in targets { + let Some(block_in) = assigned_in[target.0].as_mut() else { + return Err(ValidationError::JumpTargetNotInRPO(target)); + }; + // jump target's block_in was modified, we need to queue the block for processing. + if block_in.intersect_with(&assigned) { + worklist.push_back(target); + } + } + } insn if insn.has_output() => { assigned.insert(insn_id); } @@ -5376,6 +5473,7 @@ impl Function { // Instructions with no InsnId operands (except state) or nothing to assert Insn::Const { .. } | Insn::Param + | Insn::LoadArg { .. } | Insn::PutSpecialObject { .. } | Insn::LoadField { .. } | Insn::GetConstantPath { .. } @@ -5388,6 +5486,7 @@ impl Function { | Insn::LoadSelf | Insn::Snapshot { .. } | Insn::Jump { .. } + | Insn::Entries { .. } | Insn::EntryPoint { .. } | Insn::PatchPoint { .. } | Insn::SideExit { .. } @@ -5683,6 +5782,11 @@ impl<'a> std::fmt::Display for FunctionPrinter<'a> { }; writeln!(f, "fn {iseq_name}:")?; for block_id in fun.rpo() { + if !self.display_snapshot_and_tp_patchpoints && block_id == fun.entries_block { + // Unless we're doing --zjit-dump-hir=all, skip the entries superblock — it's an + // internal CFG artifact + continue; + } write!(f, "{block_id}(")?; if !fun.blocks[block_id.0].params.is_empty() { let mut sep = ""; @@ -7433,6 +7537,9 @@ pub fn iseq_to_hir(iseq: *const rb_iseq_t) -> Result { } } + // Populate the entries superblock with an Entries instruction targeting all entry blocks + fun.seal_entries(); + fun.set_param_types(); fun.infer_types(); @@ -7545,7 +7652,9 @@ fn compile_jit_entry_state(fun: &mut Function, jit_entry_block: BlockId, jit_ent None }; - let self_param = fun.push_insn(jit_entry_block, Insn::Param); + let mut arg_idx: u32 = 0; + let self_param = fun.push_insn(jit_entry_block, Insn::LoadArg { idx: arg_idx, id: ID!(self_), val_type: types::BasicObject }); + arg_idx += 1; let mut entry_state = FrameState::new(iseq); for local_idx in 0..num_locals(iseq) { if (lead_num + passed_opt_num..lead_num + opt_num).contains(&local_idx) { @@ -7559,7 +7668,9 @@ fn compile_jit_entry_state(fun: &mut Function, jit_entry_block: BlockId, jit_ent let ep_offset = local_idx_to_ep_offset(iseq, local_idx) as u32; entry_state.locals.push(fun.push_insn(jit_entry_block, Insn::GetLocal { level: 0, ep_offset, use_sp: false, rest_param: false })); } else if local_idx < param_size { - entry_state.locals.push(fun.push_insn(jit_entry_block, Insn::Param)); + let id = unsafe { rb_zjit_local_id(iseq, local_idx.try_into().unwrap()) }; + entry_state.locals.push(fun.push_insn(jit_entry_block, Insn::LoadArg { idx: arg_idx, id, val_type: types::BasicObject })); + arg_idx += 1; } else { entry_state.locals.push(fun.push_insn(jit_entry_block, Insn::Const { val: Const::Value(Qnil) })); } @@ -7567,100 +7678,119 @@ fn compile_jit_entry_state(fun: &mut Function, jit_entry_block: BlockId, jit_ent (self_param, entry_state) } -pub struct Dominators<'a> { - f: &'a Function, - dominators: Vec>, +pub struct Dominators { + /// Immediate dominator for each block, indexed by BlockId. + /// idom(root) = root (self-loop is sentinel), idom[unreachable] == IDOM_NONE. + idoms: Vec, } -impl<'a> Dominators<'a> { - pub fn new(f: &'a Function) -> Self { +/// Sentinel value for "no idom computed yet". +const IDOM_NONE: BlockId = BlockId(usize::MAX); + +impl Dominators { + pub fn new(f: &Function) -> Self { let mut cfi = ControlFlowInfo::new(f); Self::with_cfi(f, &mut cfi) } - pub fn with_cfi(f: &'a Function, cfi: &mut ControlFlowInfo) -> Self { - let block_ids = f.rpo(); - let mut dominators = vec![vec![]; f.blocks.len()]; - - // Compute dominators for each node using fixed point iteration. - // Approach can be found in Figure 1 of: - // https://www.cs.tufts.edu/~nr/cs257/archive/keith-cooper/dom14.pdf - // - // Initially we set: - // - // dom(entry) = {entry} for each entry block - // dom(b != entry) = {all nodes} - // - // Iteratively, apply: - // - // dom(b) = {b} union intersect(dom(p) for p in predecessors(b)) - // - // When we've run the algorithm and the dominator set no longer changes - // between iterations, then we have found the dominator sets. + /// Compute immediate dominators using the "engineered algorithm" from + /// Cooper, Harvey & Kennedy, "A Simple, Fast Dominance Algorithm" (2001), + /// Figure 3: + pub fn with_cfi(f: &Function, cfi: &mut ControlFlowInfo) -> Self { + let rpo = f.rpo(); + let num_blocks = f.blocks.len(); - // Set up entry blocks. - // Entry blocks are only dominated by themselves. - for entry_block in &f.entry_blocks() { - dominators[entry_block.0] = vec![*entry_block]; + // Map BlockId → RPO index for O(1) lookup in intersect. + let mut rpo_order = vec![usize::MAX; num_blocks]; + for (idx, &block) in rpo.iter().enumerate() { + rpo_order[block.0] = idx; } - // Setup the initial dominator sets. - for block_id in &block_ids { - if !f.entry_blocks().contains(block_id) { - // Non entry blocks are initially dominated by all other blocks. - dominators[block_id.0] = block_ids.clone(); - } - } + // Initialize idom: root's idom is itself, everything else is undefined. + let mut idoms = vec![IDOM_NONE; num_blocks]; + let root = f.entries_block; + idoms[root.0] = root; let mut changed = true; while changed { changed = false; - - for block_id in &block_ids { - if *block_id == f.entry_block { - continue; - } - - // Get all predecessors for a given block. - let block_preds: Vec = cfi.predecessors(*block_id).collect(); - if block_preds.is_empty() { - continue; - } - - let mut new_doms = dominators[block_preds[0].0].clone(); - - // Compute the intersection of predecessor dominator sets into `new_doms`. - for pred_id in &block_preds[1..] { - let pred_doms = &dominators[pred_id.0]; - // Only keep a dominator in `new_doms` if it is also found in pred_doms - new_doms.retain(|d| pred_doms.contains(d)); + for &block in &rpo { + if block == root { continue; } + + // Find the first predecessor that already has an idom computed. + let preds: Vec = cfi.predecessors(block).collect(); + let mut new_idom = IDOM_NONE; + for &p in &preds { + if idoms[p.0] != IDOM_NONE { + new_idom = p; + break; + } } + if new_idom == IDOM_NONE { continue; } - // Insert sorted into `new_doms`. - match new_doms.binary_search(block_id) { - Ok(_) => {} - Err(pos) => new_doms.insert(pos, *block_id) + // Intersect with remaining processed predecessors. + for &p in &preds { + if p == new_idom { continue; } + if idoms[p.0] != IDOM_NONE { + new_idom = Self::intersect(&idoms, &rpo_order, p, new_idom); + } } - // If we have computed a new dominator set, then we can update - // the dominators and mark that we need another iteration. - if dominators[block_id.0] != new_doms { - dominators[block_id.0] = new_doms; + if idoms[block.0] != new_idom { + idoms[block.0] = new_idom; changed = true; } } } - Self { f, dominators } + Self { idoms } } + /// Walk up the dominator tree from two fingers until they meet. + /// Uses RPO indices: a node with a *lower* RPO index is *higher* in the tree. + fn intersect(idoms: &[BlockId], rpo_order: &[usize], mut b1: BlockId, mut b2: BlockId) -> BlockId { + while b1 != b2 { + while rpo_order[b1.0] > rpo_order[b2.0] { + b1 = idoms[b1.0]; + } + while rpo_order[b2.0] > rpo_order[b1.0] { + b2 = idoms[b2.0]; + } + } + b1 + } + /// Return the immediate dominator of `block`. + pub fn idom(&self, block: BlockId) -> BlockId { + self.idoms[block.0] + } + + /// Return true if `left` is dominated by `right`. pub fn is_dominated_by(&self, left: BlockId, right: BlockId) -> bool { - self.dominators(left).any(|&b| b == right) + if self.idom(left) == IDOM_NONE { return false; } + let mut block = left; + loop { + if block == right { return true; } + if self.idom(block) == block { return false; } + block = self.idom(block); + } } - pub fn dominators(&self, block: BlockId) -> Iter<'_, BlockId> { - self.dominators[block.0].iter() + /// Compute the full dominator set for `block` by walking the idom chain to the root. + /// Returns dominators sorted by BlockId (ascending). Only used in tests; + /// production code should use `idom()` or `is_dominated_by()` instead. + pub fn dominators(&self, block: BlockId) -> Vec { + let mut doms = Vec::new(); + if self.idom(block) != IDOM_NONE { + let mut b = block; + loop { + doms.push(b); + if self.idom(b) == b { break; } + b = self.idom(b); + } + } + doms.sort(); + doms } } @@ -7688,14 +7818,20 @@ impl<'a> ControlFlowInfo<'a> { // Ordering is important so that the expect tests that serialize the predecessors // and successors don't fail intermittently. // todo(aidenfoxivey): Use `BlockSet` in lieu of `BTreeSet` - let successors: BTreeSet = block - .insns - .iter() - .map(|&insn_id| uf.find_const(insn_id)) - .filter_map(|insn_id| { - Self::extract_jump_target(&function.insns[insn_id.0]) - }) - .collect(); + let mut successors: BTreeSet = BTreeSet::new(); + for &insn_id in &block.insns { + let insn_id = uf.find_const(insn_id); + match &function.insns[insn_id.0] { + Insn::Entries { targets } => { + successors.extend(targets); + } + insn => { + if let Some(target) = Self::extract_jump_target(insn) { + successors.insert(target); + } + } + } + } // Update predecessors for successor blocks. for &succ_id in &successors { @@ -7746,14 +7882,14 @@ impl<'a> ControlFlowInfo<'a> { pub struct LoopInfo<'a> { cfi: &'a ControlFlowInfo<'a>, - dominators: &'a Dominators<'a>, + dominators: &'a Dominators, loop_depths: HashMap, loop_headers: BlockSet, back_edge_sources: BlockSet, } impl<'a> LoopInfo<'a> { - pub fn new(cfi: &'a ControlFlowInfo<'a>, dominators: &'a Dominators<'a>) -> Self { + pub fn new(cfi: &'a ControlFlowInfo<'a>, dominators: &'a Dominators) -> Self { let mut loop_headers: BlockSet = BlockSet::with_capacity(cfi.function.num_blocks()); let mut loop_depths: HashMap = HashMap::new(); let mut back_edge_sources: BlockSet = BlockSet::with_capacity(cfi.function.num_blocks()); @@ -7870,26 +8006,31 @@ mod rpo_tests { #[test] fn one_block() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let entry = function.entry_block; let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); function.push_insn(entry, Insn::Return { val }); - assert_eq!(function.rpo(), vec![entry]); + function.seal_entries(); + assert_eq!(function.rpo(), vec![entries, entry]); } #[test] fn jump() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let entry = function.entry_block; let exit = function.new_block(0); function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] })); let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); function.push_insn(entry, Insn::Return { val }); - assert_eq!(function.rpo(), vec![entry, exit]); + function.seal_entries(); + assert_eq!(function.rpo(), vec![entries, entry, exit]); } #[test] fn diamond_iftrue() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let entry = function.entry_block; let side = function.new_block(0); let exit = function.new_block(0); @@ -7899,12 +8040,14 @@ mod rpo_tests { function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] })); let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); function.push_insn(entry, Insn::Return { val }); - assert_eq!(function.rpo(), vec![entry, side, exit]); + function.seal_entries(); + assert_eq!(function.rpo(), vec![entries, entry, side, exit]); } #[test] fn diamond_iffalse() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let entry = function.entry_block; let side = function.new_block(0); let exit = function.new_block(0); @@ -7914,15 +8057,18 @@ mod rpo_tests { function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] })); let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); function.push_insn(entry, Insn::Return { val }); - assert_eq!(function.rpo(), vec![entry, side, exit]); + function.seal_entries(); + assert_eq!(function.rpo(), vec![entries, entry, side, exit]); } #[test] fn a_loop() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let entry = function.entry_block; function.push_insn(entry, Insn::Jump(BranchEdge { target: entry, args: vec![] })); - assert_eq!(function.rpo(), vec![entry]); + function.seal_entries(); + assert_eq!(function.rpo(), vec![entries, entry]); } } @@ -7945,6 +8091,7 @@ mod validation_tests { let mut function = Function::new(std::ptr::null()); let entry = function.entry_block; function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); + function.seal_entries(); assert_matches_err(function.validate(), ValidationError::BlockHasNoTerminator(entry)); } @@ -7955,6 +8102,7 @@ mod validation_tests { let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); let insn_id = function.push_insn(entry, Insn::Return { val }); function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); + function.seal_entries(); assert_matches_err(function.validate(), ValidationError::TerminatorNotAtEnd(entry, insn_id, 1)); } @@ -7965,6 +8113,7 @@ mod validation_tests { let side = function.new_block(0); let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); function.push_insn(entry, Insn::IfTrue { val, target: BranchEdge { target: side, args: vec![val, val, val] } }); + function.seal_entries(); assert_matches_err(function.validate(), ValidationError::MismatchedBlockArity(entry, 0, 3)); } @@ -7975,6 +8124,7 @@ mod validation_tests { let side = function.new_block(0); let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); function.push_insn(entry, Insn::IfFalse { val, target: BranchEdge { target: side, args: vec![val, val, val] } }); + function.seal_entries(); assert_matches_err(function.validate(), ValidationError::MismatchedBlockArity(entry, 0, 3)); } @@ -7985,6 +8135,7 @@ mod validation_tests { let side = function.new_block(0); let val = function.push_insn(entry, Insn::Const { val: Const::Value(Qnil) }); function.push_insn(entry, Insn::Jump ( BranchEdge { target: side, args: vec![val, val, val] } )); + function.seal_entries(); assert_matches_err(function.validate(), ValidationError::MismatchedBlockArity(entry, 0, 3)); } @@ -7995,6 +8146,7 @@ mod validation_tests { // Create an instruction without making it belong to anything. let dangling = function.new_insn(Insn::Const{val: Const::CBool(true)}); let val = function.push_insn(function.entry_block, Insn::ArrayDup { val: dangling, state: InsnId(0usize) }); + function.seal_entries(); assert_matches_err(function.validate_definite_assignment(), ValidationError::OperandNotDefined(entry, val, dangling)); } @@ -8005,6 +8157,7 @@ mod validation_tests { // Create an instruction without making it belong to anything. let dangling = function.new_insn(Insn::Const{val: Const::CBool(true)}); let val = function.push_insn(function.entry_block, Insn::ArrayDup { val: dangling, state: InsnId(0usize) }); + function.seal_entries(); assert_matches_err(function.temporary_validate_block_local_definite_assignment(), ValidationError::OperandNotDefined(entry, val, dangling)); } @@ -8016,6 +8169,7 @@ mod validation_tests { // Ret is a non-output instruction. let ret = function.push_insn(function.entry_block, Insn::Return { val: const_ }); let val = function.push_insn(function.entry_block, Insn::ArrayDup { val: ret, state: InsnId(0usize) }); + function.seal_entries(); assert_matches_err(function.validate_definite_assignment(), ValidationError::OperandNotDefined(entry, val, ret)); } @@ -8027,6 +8181,7 @@ mod validation_tests { // Ret is a non-output instruction. let ret = function.push_insn(function.entry_block, Insn::Return { val: const_ }); let val = function.push_insn(function.entry_block, Insn::ArrayDup { val: ret, state: InsnId(0usize) }); + function.seal_entries(); assert_matches_err(function.temporary_validate_block_local_definite_assignment(), ValidationError::OperandNotDefined(entry, val, ret)); } @@ -8043,6 +8198,7 @@ mod validation_tests { function.push_insn(entry, Insn::IfFalse { val: val1, target: BranchEdge { target: side, args: vec![] } }); function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] })); let val2 = function.push_insn(exit, Insn::ArrayDup { val: v0, state: v0 }); + function.seal_entries(); crate::cruby::with_rubyvm(|| { function.infer_types(); assert_matches_err(function.validate_definite_assignment(), ValidationError::OperandNotDefined(exit, val2, v0)); @@ -8062,6 +8218,7 @@ mod validation_tests { function.push_insn(entry, Insn::IfFalse { val, target: BranchEdge { target: side, args: vec![] } }); function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![] })); let _val = function.push_insn(exit, Insn::ArrayDup { val: v0, state: v0 }); + function.seal_entries(); crate::cruby::with_rubyvm(|| { function.infer_types(); // Just checking that we don't panic. @@ -8077,6 +8234,7 @@ mod validation_tests { let val = function.push_insn(block, Insn::Const { val: Const::Value(Qnil) }); function.push_insn_id(block, val); function.push_insn(block, Insn::Return { val }); + function.seal_entries(); assert_matches_err(function.validate(), ValidationError::DuplicateInstruction(block, val)); } @@ -8089,6 +8247,7 @@ mod validation_tests { let val1 = function.push_insn(block, Insn::Const { val: Const::Value(Qnil) }); function.make_equal_to(val1, val0); function.push_insn(block, Insn::Return { val: val0 }); + function.seal_entries(); assert_matches_err(function.validate(), ValidationError::DuplicateInstruction(block, val0)); } @@ -8102,6 +8261,7 @@ mod validation_tests { function.push_insn(block, Insn::Jump(BranchEdge { target: exit, args: vec![] })); function.push_insn_id(exit, val); function.push_insn(exit, Insn::Return { val }); + function.seal_entries(); assert_matches_err(function.validate(), ValidationError::DuplicateInstruction(exit, val)); } } @@ -8133,6 +8293,7 @@ mod infer_tests { let mut function = Function::new(std::ptr::null()); let nil = function.push_insn(function.entry_block, Insn::Const { val: Const::Value(Qnil) }); let val = function.push_insn(function.entry_block, Insn::Test { val: nil }); + function.seal_entries(); function.infer_types(); assert_bit_equal(function.type_of(val), Type::from_cbool(false)); }); @@ -8144,6 +8305,7 @@ mod infer_tests { let mut function = Function::new(std::ptr::null()); let false_ = function.push_insn(function.entry_block, Insn::Const { val: Const::Value(Qfalse) }); let val = function.push_insn(function.entry_block, Insn::Test { val: false_ }); + function.seal_entries(); function.infer_types(); assert_bit_equal(function.type_of(val), Type::from_cbool(false)); }); @@ -8155,6 +8317,7 @@ mod infer_tests { let mut function = Function::new(std::ptr::null()); let true_ = function.push_insn(function.entry_block, Insn::Const { val: Const::Value(Qtrue) }); let val = function.push_insn(function.entry_block, Insn::Test { val: true_ }); + function.seal_entries(); function.infer_types(); assert_bit_equal(function.type_of(val), Type::from_cbool(true)); }); @@ -8190,6 +8353,7 @@ mod infer_tests { let v1 = function.push_insn(entry, Insn::Const { val: Const::Value(VALUE::fixnum_from_usize(4)) }); function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![v1] })); let param = function.push_insn(exit, Insn::Param); + function.seal_entries(); crate::cruby::with_rubyvm(|| { function.infer_types(); }); @@ -8209,6 +8373,7 @@ mod infer_tests { let v1 = function.push_insn(entry, Insn::Const { val: Const::Value(Qfalse) }); function.push_insn(entry, Insn::Jump(BranchEdge { target: exit, args: vec![v1] })); let param = function.push_insn(exit, Insn::Param); + function.seal_entries(); crate::cruby::with_rubyvm(|| { function.infer_types(); assert_bit_equal(function.type_of(param), types::TrueClass.union(types::FalseClass)); @@ -8244,32 +8409,39 @@ mod graphviz_tests { mode=hier; overlap=false; splines=true; bb0 [label=< + +
bb0() 
Entries bb1, bb2 
>]; + bb1 [label=< + - +
bb1() 
EntryPoint interpreter 
v1:BasicObject = LoadSelf 
v2:BasicObject = GetLocal :x, l0, SP@5 
v3:BasicObject = GetLocal :y, l0, SP@4 
Jump bb2(v1, v2, v3) 
Jump bb3(v1, v2, v3) 
>]; - bb0:v4 -> bb2:params:n; - bb1 [label=< - + bb1:v4 -> bb3:params:n; + bb2 [label=<
bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject) 
+ - + + + +
bb2() 
EntryPoint JIT(0) 
Jump bb2(v6, v7, v8) 
v6:BasicObject = LoadArg :self@0 
v7:BasicObject = LoadArg :x@1 
v8:BasicObject = LoadArg :y@2 
Jump bb3(v6, v7, v8) 
>]; - bb1:v9 -> bb2:params:n; - bb2 [label=< - + bb2:v9 -> bb3:params:n; + bb3 [label=<
bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject) 
+ - - - - - - + + + + + + - +
bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject) 
PatchPoint NoTracePoint 
PatchPoint NoTracePoint 
PatchPoint NoTracePoint 
PatchPoint MethodRedefined(Integer@0x1000, |@0x1008, cme:0x1010) 
v26:Fixnum = GuardType v11, Fixnum 
v27:Fixnum = GuardType v12, Fixnum 
v28:Fixnum = FixnumOr v26, v27 
IncrCounter inline_cfunc_optimized_send_count 
PatchPoint NoTracePoint 
PatchPoint MethodRedefined(Integer@0x1000, |@0x1008, cme:0x1010) 
v27:Fixnum = GuardType v11, Fixnum 
v28:Fixnum = GuardType v12, Fixnum 
v29:Fixnum = FixnumOr v27, v28 
IncrCounter inline_cfunc_optimized_send_count 
PatchPoint NoTracePoint 
CheckInterrupts 
Return v28 
Return v29 
>]; } "#); @@ -8295,25 +8467,31 @@ mod graphviz_tests { mode=hier; overlap=false; splines=true; bb0 [label=< + +
bb0() 
Entries bb1, bb2 
>]; + bb1 [label=< + - +
bb1() 
EntryPoint interpreter 
v1:BasicObject = LoadSelf 
v2:BasicObject = GetLocal :c, l0, SP@4 
Jump bb2(v1, v2) 
Jump bb3(v1, v2) 
>]; - bb0:v3 -> bb2:params:n; - bb1 [label=< - + bb1:v3 -> bb3:params:n; + bb2 [label=<
bb1(v5:BasicObject, v6:BasicObject) 
+ - + + +
bb2() 
EntryPoint JIT(0) 
Jump bb2(v5, v6) 
v5:BasicObject = LoadArg :self@0 
v6:BasicObject = LoadArg :c@1 
Jump bb3(v5, v6) 
>]; - bb1:v7 -> bb2:params:n; - bb2 [label=< - + bb2:v7 -> bb3:params:n; + bb3 [label=<
bb2(v8:BasicObject, v9:BasicObject) 
+ - + @@ -8321,9 +8499,9 @@ mod graphviz_tests {
bb3(v8:BasicObject, v9:BasicObject) 
PatchPoint NoTracePoint 
CheckInterrupts 
v15:CBool = Test v9 
v16:Falsy = RefineType v9, Falsy 
IfFalse v15, bb3(v8, v16) 
IfFalse v15, bb4(v8, v16) 
v18:Truthy = RefineType v9, Truthy 
PatchPoint NoTracePoint 
v21:Fixnum[3] = Const Value(3) 
CheckInterrupts 
Return v21 
>]; - bb2:v17 -> bb3:params:n; - bb3 [label=< - + bb3:v17 -> bb4:params:n; + bb4 [label=<
bb3(v26:BasicObject, v27:Falsy) 
+ diff --git a/zjit/src/hir/opt_tests.rs b/zjit/src/hir/opt_tests.rs index 516bec1c510f5d..952f2fe77f4356 100644 --- a/zjit/src/hir/opt_tests.rs +++ b/zjit/src/hir/opt_tests.rs @@ -40,16 +40,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:TrueClass = Const Value(true) CheckInterrupts v22:TrueClass = RefineType v13, Truthy @@ -73,16 +74,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:FalseClass = Const Value(false) CheckInterrupts v20:FalseClass = RefineType v13, Falsy @@ -101,25 +103,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, +@0x1008, cme:0x1010) - v33:Fixnum[3] = Const Value(3) + v34:Fixnum[3] = Const Value(3) IncrCounter inline_cfunc_optimized_send_count v17:Fixnum[3] = Const Value(3) PatchPoint MethodRedefined(Integer@0x1000, +@0x1008, cme:0x1010) - v34:Fixnum[6] = Const Value(6) + v35:Fixnum[6] = Const Value(6) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v34 + Return v35 "); } @@ -132,25 +135,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[5] = Const Value(5) v12:Fixnum[3] = Const Value(3) PatchPoint MethodRedefined(Integer@0x1000, -@0x1008, cme:0x1010) - v33:Fixnum[2] = Const Value(2) + v34:Fixnum[2] = Const Value(2) IncrCounter inline_cfunc_optimized_send_count v17:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, -@0x1008, cme:0x1010) - v34:Fixnum[1] = Const Value(1) + v35:Fixnum[1] = Const Value(1) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v34 + Return v35 "); } @@ -163,21 +167,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[0] = Const Value(0) v12:Fixnum[1073741825] = Const Value(1073741825) PatchPoint MethodRedefined(Integer@0x1000, -@0x1008, cme:0x1010) - v24:Fixnum[-1073741825] = Const Value(-1073741825) + v25:Fixnum[-1073741825] = Const Value(-1073741825) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -190,21 +195,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[6] = Const Value(6) v12:Fixnum[7] = Const Value(7) PatchPoint MethodRedefined(Integer@0x1000, *@0x1008, cme:0x1010) - v24:Fixnum[42] = Const Value(42) + v25:Fixnum[42] = Const Value(42) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -218,30 +224,32 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :n, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :n@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:Fixnum[0] = Const Value(0) PatchPoint MethodRedefined(Integer@0x1000, *@0x1008, cme:0x1010) - v33:Fixnum = GuardType v9, Fixnum - v45:Fixnum[0] = Const Value(0) + v34:Fixnum = GuardType v9, Fixnum + v46:Fixnum[0] = Const Value(0) IncrCounter inline_cfunc_optimized_send_count v20:Fixnum[0] = Const Value(0) PatchPoint MethodRedefined(Integer@0x1000, *@0x1008, cme:0x1010) - v38:Fixnum = GuardType v9, Fixnum - v46:Fixnum[0] = Const Value(0) + v39:Fixnum = GuardType v9, Fixnum + v47:Fixnum[0] = Const Value(0) IncrCounter inline_cfunc_optimized_send_count PatchPoint MethodRedefined(Integer@0x1000, +@0x1038, cme:0x1040) - v47:Fixnum[0] = Const Value(0) + v48:Fixnum[0] = Const Value(0) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v47 + Return v48 "); } @@ -255,21 +263,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[0] = Const Value(0) v12:Fixnum[0] = Const Value(0) PatchPoint MethodRedefined(Integer@0x1000, %@0x1008, cme:0x1010) - v22:Fixnum = FixnumMod v10, v12 + v23:Fixnum = FixnumMod v10, v12 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v22 + Return v23 "); } @@ -282,21 +291,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[11] = Const Value(11) v12:Fixnum[0] = Const Value(0) PatchPoint MethodRedefined(Integer@0x1000, %@0x1008, cme:0x1010) - v22:Fixnum = FixnumMod v10, v12 + v23:Fixnum = FixnumMod v10, v12 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v22 + Return v23 "); } @@ -309,21 +319,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[0] = Const Value(0) v12:Fixnum[11] = Const Value(11) PatchPoint MethodRedefined(Integer@0x1000, %@0x1008, cme:0x1010) - v24:Fixnum[0] = Const Value(0) + v25:Fixnum[0] = Const Value(0) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -336,21 +347,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[11] = Const Value(11) v12:Fixnum[3] = Const Value(3) PatchPoint MethodRedefined(Integer@0x1000, %@0x1008, cme:0x1010) - v24:Fixnum[2] = Const Value(2) + v25:Fixnum[2] = Const Value(2) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -363,21 +375,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[-7] = Const Value(-7) v12:Fixnum[3] = Const Value(3) PatchPoint MethodRedefined(Integer@0x1000, %@0x1008, cme:0x1010) - v24:Fixnum[2] = Const Value(2) + v25:Fixnum[2] = Const Value(2) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -390,21 +403,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[7] = Const Value(7) v12:Fixnum[-3] = Const Value(-3) PatchPoint MethodRedefined(Integer@0x1000, %@0x1008, cme:0x1010) - v24:Fixnum[-2] = Const Value(-2) + v25:Fixnum[-2] = Const Value(-2) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -417,21 +431,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[-7] = Const Value(-7) v12:Fixnum[-3] = Const Value(-3) PatchPoint MethodRedefined(Integer@0x1000, %@0x1008, cme:0x1010) - v24:Fixnum[-1] = Const Value(-1) + v25:Fixnum[-1] = Const Value(-1) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -448,18 +463,19 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, <@0x1008, cme:0x1010) - v42:TrueClass = Const Value(true) + v43:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v24:Fixnum[3] = Const Value(3) @@ -481,24 +497,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, <=@0x1008, cme:0x1010) - v59:TrueClass = Const Value(true) + v60:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v23:Fixnum[2] = Const Value(2) v25:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, <=@0x1008, cme:0x1010) - v61:TrueClass = Const Value(true) + v62:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v37:Fixnum[3] = Const Value(3) @@ -520,18 +537,19 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[2] = Const Value(2) v12:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, >@0x1008, cme:0x1010) - v42:TrueClass = Const Value(true) + v43:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v24:Fixnum[3] = Const Value(3) @@ -553,24 +571,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[2] = Const Value(2) v12:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, >=@0x1008, cme:0x1010) - v59:TrueClass = Const Value(true) + v60:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v23:Fixnum[2] = Const Value(2) v25:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, >=@0x1008, cme:0x1010) - v61:TrueClass = Const Value(true) + v62:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v37:Fixnum[3] = Const Value(3) @@ -592,18 +611,19 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, ==@0x1008, cme:0x1010) - v42:FalseClass = Const Value(false) + v43:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v33:Fixnum[4] = Const Value(4) @@ -625,18 +645,19 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[2] = Const Value(2) v12:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, ==@0x1008, cme:0x1010) - v42:TrueClass = Const Value(true) + v43:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v24:Fixnum[3] = Const Value(3) @@ -658,19 +679,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, !=@0x1008, cme:0x1010) PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ) - v43:TrueClass = Const Value(true) + v44:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v24:Fixnum[3] = Const Value(3) @@ -692,19 +714,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[2] = Const Value(2) v12:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, !=@0x1008, cme:0x1010) PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ) - v43:FalseClass = Const Value(false) + v44:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v33:Fixnum[4] = Const Value(4) @@ -740,19 +763,21 @@ mod hir_opt_tests { assert_eq!(VALUE::fixnum_from_usize(2), result); assert_snapshot!(hir_string("test"), @r" fn test@:13: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :object, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :object@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(CustomEq@0x1000) PatchPoint MethodRedefined(CustomEq@0x1000, !=@0x1008, cme:0x1010) - v28:HeapObject[class_exact:CustomEq] = GuardType v9, HeapObject[class_exact:CustomEq] - v29:BoolExact = CCallWithFrame v28, :BasicObject#!=@0x1038, v9 + v29:HeapObject[class_exact:CustomEq] = GuardType v9, HeapObject[class_exact:CustomEq] + v30:BoolExact = CCallWithFrame v29, :BasicObject#!=@0x1038, v9 v20:NilClass = Const Value(nil) CheckInterrupts Return v20 @@ -769,22 +794,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, +@0x1008, cme:0x1010) - v24:Fixnum = GuardType v9, Fixnum - v25:Fixnum = FixnumAdd v24, v14 + v25:Fixnum = GuardType v9, Fixnum + v26:Fixnum = FixnumAdd v25, v14 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -799,71 +826,82 @@ mod hir_opt_tests { "); assert_snapshot!(hir_strings!("rest", "kw", "kw_rest", "block", "post"), @r" fn rest@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:ArrayExact = GetLocal :array, l0, SP@4, * - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:ArrayExact): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:ArrayExact): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :array@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): CheckInterrupts Return v9 fn kw@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :k, l0, SP@5 v3:BasicObject = GetLocal , l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :k@1 v8:BasicObject = GetLocal , l0, EP@3 - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): CheckInterrupts Return v11 fn kw_rest@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :k, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :k@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): CheckInterrupts Return v9 fn block@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :b@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:NilClass = Const Value(nil) CheckInterrupts Return v13 fn post@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:ArrayExact = GetLocal :rest, l0, SP@5, * v3:BasicObject = GetLocal :post, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:ArrayExact, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:ArrayExact, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :rest@1 + v8:BasicObject = LoadArg :post@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): CheckInterrupts Return v12 "); @@ -880,20 +918,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v19:BasicObject = SendDirect v18, 0x1038, :foo (0x1048) + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v20:BasicObject = SendDirect v19, 0x1038, :foo (0x1048) CheckInterrupts - Return v19 + Return v20 "); } @@ -908,21 +947,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, baz@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:Fixnum[1] = Const Value(1) + v22:Fixnum[1] = Const Value(1) CheckInterrupts - Return v21 + Return v22 "); } @@ -936,20 +976,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, baz@0x1008, cme:0x1010) - v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v20:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v19 + Return v20 "); } @@ -973,21 +1014,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:8: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v20:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v21:BasicObject = SendDirect v20, 0x1038, :foo (0x1048), v11 + v21:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v22:BasicObject = SendDirect v21, 0x1038, :foo (0x1048), v11 CheckInterrupts - Return v21 + Return v22 "); } @@ -1002,22 +1044,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, fun_new_map@0x1008, cme:0x1010) - v22:ArraySubclass[class_exact:C] = GuardType v9, ArraySubclass[class_exact:C] - v23:BasicObject = SendDirect v22, 0x1038, :fun_new_map (0x1048) + v23:ArraySubclass[class_exact:C] = GuardType v9, ArraySubclass[class_exact:C] + v24:BasicObject = SendDirect v23, 0x1038, :fun_new_map (0x1048) v15:BasicObject = GetLocal :o, l0, EP@3 CheckInterrupts - Return v23 + Return v24 "); } @@ -1034,22 +1078,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, bar@0x1008, cme:0x1010) - v23:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v24:BasicObject = CCallWithFrame v23, :Enumerable#bar@0x1038, block=0x1040 + v24:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:BasicObject = CCallWithFrame v24, :Enumerable#bar@0x1038, block=0x1040 v15:BasicObject = GetLocal :o, l0, EP@3 CheckInterrupts - Return v24 + Return v25 "); } @@ -1066,21 +1112,23 @@ mod hir_opt_tests { ", "{ specialized_instruction: false }"); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, length@0x1008, cme:0x1010) - v22:ArrayExact = GuardType v9, ArrayExact - v23:BasicObject = CCallWithFrame v22, :Array#length@0x1038 + v23:ArrayExact = GuardType v9, ArrayExact + v24:BasicObject = CCallWithFrame v23, :Array#length@0x1038 CheckInterrupts - Return v23 + Return v24 "); } @@ -1097,14 +1145,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = Send v6, :foo # SendFallbackReason: SendWithoutBlock: unsupported method type Null CheckInterrupts Return v11 @@ -1123,20 +1172,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v19:BasicObject = SendDirect v18, 0x1038, :foo (0x1048) + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v20:BasicObject = SendDirect v19, 0x1038, :foo (0x1048) CheckInterrupts - Return v19 + Return v20 "); } @@ -1150,21 +1200,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[3] = Const Value(3) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, Integer@0x1008, cme:0x1010) - v20:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v21:BasicObject = SendDirect v20, 0x1038, :Integer (0x1048), v11 + v21:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v22:BasicObject = SendDirect v21, 0x1038, :Integer (0x1048), v11 CheckInterrupts - Return v21 + Return v22 "); } @@ -1179,22 +1230,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) v13:Fixnum[2] = Const Value(2) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v22:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v23:BasicObject = SendDirect v22, 0x1038, :foo (0x1048), v11, v13 + v23:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v24:BasicObject = SendDirect v23, 0x1038, :foo (0x1048), v11, v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -1211,24 +1263,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v23:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v24:BasicObject = SendDirect v23, 0x1038, :foo (0x1048) + v24:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v25:BasicObject = SendDirect v24, 0x1038, :foo (0x1048) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, bar@0x1050, cme:0x1058) - v27:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v28:BasicObject = SendDirect v27, 0x1038, :bar (0x1048) + v28:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v29:BasicObject = SendDirect v28, 0x1038, :bar (0x1048) CheckInterrupts - Return v28 + Return v29 "); } @@ -1241,20 +1294,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v19:BasicObject = SendDirect v18, 0x1038, :foo (0x1048) + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v20:BasicObject = SendDirect v19, 0x1038, :foo (0x1048) CheckInterrupts - Return v19 + Return v20 "); } @@ -1267,21 +1321,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[3] = Const Value(3) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v20:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v21:BasicObject = SendDirect v20, 0x1038, :foo (0x1048), v11 + v21:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v22:BasicObject = SendDirect v21, 0x1038, :foo (0x1048), v11 CheckInterrupts - Return v21 + Return v22 "); } @@ -1294,22 +1349,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[3] = Const Value(3) v13:Fixnum[4] = Const Value(4) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v22:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v23:BasicObject = SendDirect v22, 0x1038, :foo (0x1048), v11, v13 + v23:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v24:BasicObject = SendDirect v23, 0x1038, :foo (0x1048), v11, v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -1323,32 +1379,33 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, target@0x1008, cme:0x1010) - v44:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v45:BasicObject = SendDirect v44, 0x1038, :target (0x1048) + v45:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v46:BasicObject = SendDirect v45, 0x1038, :target (0x1048) v14:Fixnum[10] = Const Value(10) v16:Fixnum[20] = Const Value(20) v18:Fixnum[30] = Const Value(30) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, target@0x1008, cme:0x1010) - v48:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v49:BasicObject = SendDirect v48, 0x1038, :target (0x1048), v14, v16, v18 + v49:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v50:BasicObject = SendDirect v49, 0x1038, :target (0x1048), v14, v16, v18 v24:Fixnum[10] = Const Value(10) v26:Fixnum[20] = Const Value(20) v28:Fixnum[30] = Const Value(30) v30:Fixnum[40] = Const Value(40) v32:Fixnum[50] = Const Value(50) v34:BasicObject = Send v6, :target, v24, v26, v28, v30, v32 # SendFallbackReason: Argument count does not match parameter count - v37:ArrayExact = NewArray v45, v49, v34 + v37:ArrayExact = NewArray v46, v50, v34 CheckInterrupts Return v37 "); @@ -1364,22 +1421,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v12:StringExact = StringCopy v11 PatchPoint NoSingletonClass(Object@0x1008) PatchPoint MethodRedefined(Object@0x1008, puts@0x1010, cme:0x1018) - v22:HeapObject[class_exact*:Object@VALUE(0x1008)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1008)] - v23:BasicObject = CCallVariadic v22, :Kernel#puts@0x1040, v12 + v23:HeapObject[class_exact*:Object@VALUE(0x1008)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1008)] + v24:BasicObject = CCallVariadic v23, :Kernel#puts@0x1040, v12 CheckInterrupts - Return v23 + Return v24 "); } @@ -1396,22 +1454,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, +@0x1008, cme:0x1010) - v25:Fixnum = GuardType v11, Fixnum + v26:Fixnum = GuardType v11, Fixnum IncrCounter inline_iseq_optimized_send_count - v28:Fixnum[100] = Const Value(100) + v29:Fixnum[100] = Const Value(100) CheckInterrupts - Return v28 + Return v29 "); } @@ -1423,23 +1484,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, +@0x1008, cme:0x1010) - v26:Fixnum = GuardType v11, Fixnum - v27:Fixnum = GuardType v12, Fixnum - v28:Fixnum = FixnumAdd v26, v27 + v27:Fixnum = GuardType v11, Fixnum + v28:Fixnum = GuardType v12, Fixnum + v29:Fixnum = FixnumAdd v27, v28 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -1451,22 +1515,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, +@0x1008, cme:0x1010) - v24:Fixnum = GuardType v9, Fixnum - v25:Fixnum = FixnumAdd v24, v14 + v25:Fixnum = GuardType v9, Fixnum + v26:Fixnum = FixnumAdd v25, v14 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -1478,22 +1544,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, +@0x1008, cme:0x1010) - v24:Fixnum = GuardType v9, Fixnum - v25:Fixnum = FixnumAdd v13, v24 + v25:Fixnum = GuardType v9, Fixnum + v26:Fixnum = FixnumAdd v13, v25 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -1505,23 +1573,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, []@0x1008, cme:0x1010) - v26:Fixnum = GuardType v11, Fixnum - v27:Fixnum = GuardType v12, Fixnum - v28:Fixnum = FixnumAref v26, v27 + v27:Fixnum = GuardType v11, Fixnum + v28:Fixnum = GuardType v12, Fixnum + v29:Fixnum = FixnumAref v27, v28 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -1535,14 +1606,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1000, []@0x1008, cme:0x1010) @@ -1560,21 +1632,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[2] = Const Value(2) v14:Fixnum[3] = Const Value(3) PatchPoint MethodRedefined(Integer@0x1000, []@0x1008, cme:0x1010) - v23:BasicObject = CCallVariadic v10, :Integer#[]@0x1038, v12, v14 + v24:BasicObject = CCallVariadic v10, :Integer#[]@0x1038, v12, v14 CheckInterrupts - Return v23 + Return v24 "); } @@ -1585,21 +1658,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v13:StringExact = StringCopy v12 PatchPoint MethodRedefined(Integer@0x1008, []@0x1010, cme:0x1018) - v23:BasicObject = CCallVariadic v10, :Integer#[]@0x1040, v13 + v24:BasicObject = CCallVariadic v10, :Integer#[]@0x1040, v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -1611,23 +1685,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, <@0x1008, cme:0x1010) - v26:Fixnum = GuardType v11, Fixnum - v27:Fixnum = GuardType v12, Fixnum - v28:BoolExact = FixnumLt v26, v27 + v27:Fixnum = GuardType v11, Fixnum + v28:Fixnum = GuardType v12, Fixnum + v29:BoolExact = FixnumLt v27, v28 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -1639,22 +1716,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, <@0x1008, cme:0x1010) - v24:Fixnum = GuardType v9, Fixnum - v25:BoolExact = FixnumLt v24, v14 + v25:Fixnum = GuardType v9, Fixnum + v26:BoolExact = FixnumLt v25, v14 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -1666,22 +1745,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, <@0x1008, cme:0x1010) - v24:Fixnum = GuardType v9, Fixnum - v25:BoolExact = FixnumLt v13, v24 + v25:Fixnum = GuardType v9, Fixnum + v26:BoolExact = FixnumLt v13, v25 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -1696,21 +1777,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:Fixnum[2] = Const Value(2) v17:Fixnum[1] = Const Value(1) - v25:RangeExact = NewRangeFixnum v17 NewRangeInclusive v13 + v26:RangeExact = NewRangeFixnum v17 NewRangeInclusive v13 CheckInterrupts - Return v25 + Return v26 "); } @@ -1726,21 +1808,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:Fixnum[2] = Const Value(2) v17:Fixnum[1] = Const Value(1) - v25:RangeExact = NewRangeFixnum v17 NewRangeExclusive v13 + v26:RangeExact = NewRangeFixnum v17 NewRangeExclusive v13 CheckInterrupts - Return v25 + Return v26 "); } @@ -1754,20 +1837,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:Fixnum[1] = Const Value(1) - v21:Fixnum = GuardType v9, Fixnum - v22:RangeExact = NewRangeFixnum v13 NewRangeInclusive v21 + v22:Fixnum = GuardType v9, Fixnum + v23:RangeExact = NewRangeFixnum v13 NewRangeInclusive v22 CheckInterrupts - Return v22 + Return v23 "); } @@ -1781,20 +1866,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:Fixnum[1] = Const Value(1) - v21:Fixnum = GuardType v9, Fixnum - v22:RangeExact = NewRangeFixnum v13 NewRangeExclusive v21 + v22:Fixnum = GuardType v9, Fixnum + v23:RangeExact = NewRangeFixnum v13 NewRangeExclusive v22 CheckInterrupts - Return v22 + Return v23 "); } @@ -1808,20 +1895,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[10] = Const Value(10) - v21:Fixnum = GuardType v9, Fixnum - v22:RangeExact = NewRangeFixnum v21 NewRangeInclusive v14 + v22:Fixnum = GuardType v9, Fixnum + v23:RangeExact = NewRangeFixnum v22 NewRangeInclusive v14 CheckInterrupts - Return v22 + Return v23 "); } @@ -1835,20 +1924,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[10] = Const Value(10) - v21:Fixnum = GuardType v9, Fixnum - v22:RangeExact = NewRangeFixnum v21 NewRangeExclusive v14 + v22:Fixnum = GuardType v9, Fixnum + v23:RangeExact = NewRangeFixnum v22 NewRangeExclusive v14 CheckInterrupts - Return v22 + Return v23 "); } @@ -1863,16 +1954,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:ArrayExact = NewArray v17:Fixnum[5] = Const Value(5) CheckInterrupts @@ -1889,28 +1981,30 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[0] = Const Value(0) PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, []@0x1008, cme:0x1010) - v25:ArrayExact = GuardType v9, ArrayExact - v26:CInt64[0] = UnboxFixnum v14 - v27:CInt64 = ArrayLength v25 - v28:CInt64[0] = GuardLess v26, v27 - v29:CInt64[0] = Const CInt64(0) - v30:CInt64[0] = GuardGreaterEq v28, v29 - v31:BasicObject = ArrayAref v25, v30 + v26:ArrayExact = GuardType v9, ArrayExact + v27:CInt64[0] = UnboxFixnum v14 + v28:CInt64 = ArrayLength v26 + v29:CInt64[0] = GuardLess v27, v28 + v30:CInt64[0] = Const CInt64(0) + v31:CInt64[0] = GuardGreaterEq v29, v30 + v32:BasicObject = ArrayAref v26, v31 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v31 + Return v32 "); assert_snapshot!(inspect("test [1,2,3]"), @"1"); } @@ -1924,23 +2018,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[0] = Const Value(0) PatchPoint NoSingletonClass(Hash@0x1000) PatchPoint MethodRedefined(Hash@0x1000, []@0x1008, cme:0x1010) - v25:HashExact = GuardType v9, HashExact - v26:BasicObject = HashAref v25, v14 + v26:HashExact = GuardType v9, HashExact + v27:BasicObject = HashAref v26, v14 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v26 + Return v27 "); assert_snapshot!(inspect("test({0 => 4})"), @"4"); } @@ -1956,16 +2052,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:RangeExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v17:Fixnum[5] = Const Value(5) CheckInterrupts @@ -1984,16 +2081,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_UMINUS) v14:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v16:StringExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) @@ -2017,17 +2115,19 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 v8:NilClass = Const Value(nil) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:NilClass): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:NilClass): v17:ArrayExact = NewArray v11 v21:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2045,16 +2145,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:HashExact = NewHash PatchPoint NoEPEscape(test) v19:Fixnum[5] = Const Value(5) @@ -2073,18 +2174,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :aval, l0, SP@6 v3:BasicObject = GetLocal :bval, l0, SP@5 v4:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :aval@1 + v9:BasicObject = LoadArg :bval@2 v10:NilClass = Const Value(nil) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:NilClass): + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:NilClass): v19:StaticSymbol[:a] = Const Value(VALUE(0x1000)) v22:StaticSymbol[:b] = Const Value(VALUE(0x1008)) v25:HashExact = NewHash v19: v13, v22: v14 @@ -2106,16 +2210,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v14:ArrayExact = ArrayDup v13 v18:Fixnum[5] = Const Value(5) @@ -2134,16 +2239,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v14:HashExact = HashDup v13 v18:Fixnum[5] = Const Value(5) @@ -2163,16 +2269,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v16:Fixnum[5] = Const Value(5) CheckInterrupts Return v16 @@ -2190,16 +2297,17 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v14:StringExact = StringCopy v13 v18:Fixnum[5] = Const Value(5) @@ -2219,19 +2327,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, +@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2250,19 +2361,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, -@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2281,19 +2395,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, *@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2312,20 +2429,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, /@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum - v32:Fixnum = FixnumDiv v30, v31 + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum + v33:Fixnum = FixnumDiv v31, v32 IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2344,20 +2464,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, %@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum - v32:Fixnum = FixnumMod v30, v31 + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum + v33:Fixnum = FixnumMod v31, v32 IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2376,19 +2499,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, <@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2407,19 +2533,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, <=@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2438,19 +2567,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, >@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2469,19 +2601,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, >=@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2500,19 +2635,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, ==@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum - v31:Fixnum = GuardType v12, Fixnum + v31:Fixnum = GuardType v11, Fixnum + v32:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2531,20 +2669,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, !=@0x1008, cme:0x1010) - v30:Fixnum = GuardType v11, Fixnum + v31:Fixnum = GuardType v11, Fixnum PatchPoint BOPRedefined(INTEGER_REDEFINED_OP_FLAG, BOP_EQ) - v32:Fixnum = GuardType v12, Fixnum + v33:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v23:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2562,14 +2703,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = GetConstantPath 0x1000 v15:Fixnum[5] = Const Value(5) CheckInterrupts @@ -2587,15 +2729,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :klass, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :klass@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:FalseClass = Const Value(false) v16:BasicObject = GetConstant v9, :ARGV, v14 v20:Fixnum[5] = Const Value(5) @@ -2613,20 +2757,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, itself@0x1008, cme:0x1010) - v21:Fixnum = GuardType v9, Fixnum + v22:Fixnum = GuardType v9, Fixnum IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v21 + Return v22 "); } @@ -2637,14 +2783,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, itself@0x1008, cme:0x1010) @@ -2664,16 +2811,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:ArrayExact = NewArray PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, itself@0x1008, cme:0x1010) @@ -2697,23 +2845,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, M) - v29:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v30:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(Module@0x1010) PatchPoint MethodRedefined(Module@0x1010, name@0x1018, cme:0x1020) IncrCounter inline_cfunc_optimized_send_count - v34:StringExact|NilClass = CCall v29, :Module#name@0x1048 + v35:StringExact|NilClass = CCall v30, :Module#name@0x1048 PatchPoint NoEPEscape(test) v22:Fixnum[1] = Const Value(1) CheckInterrupts @@ -2731,14 +2880,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, length@0x1008, cme:0x1010) @@ -2758,19 +2908,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, C) - v18:Class[C@0x1008] = Const Value(VALUE(0x1008)) + v19:Class[C@0x1008] = Const Value(VALUE(0x1008)) CheckInterrupts - Return v18 + Return v19 "); } @@ -2782,27 +2933,28 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, String) - v29:Class[String@0x1008] = Const Value(VALUE(0x1008)) + v30:Class[String@0x1008] = Const Value(VALUE(0x1008)) PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1010, Class) - v32:Class[Class@0x1018] = Const Value(VALUE(0x1018)) + v33:Class[Class@0x1018] = Const Value(VALUE(0x1018)) PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1020, Module) - v35:Class[Module@0x1028] = Const Value(VALUE(0x1028)) + v36:Class[Module@0x1028] = Const Value(VALUE(0x1028)) PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1030, BasicObject) - v38:Class[BasicObject@0x1038] = Const Value(VALUE(0x1038)) - v22:ArrayExact = NewArray v29, v32, v35, v38 + v39:Class[BasicObject@0x1038] = Const Value(VALUE(0x1038)) + v22:ArrayExact = NewArray v30, v33, v36, v39 CheckInterrupts Return v22 "); @@ -2816,21 +2968,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Enumerable) - v23:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v24:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1010, Kernel) - v26:ModuleExact[VALUE(0x1018)] = Const Value(VALUE(0x1018)) - v16:ArrayExact = NewArray v23, v26 + v27:ModuleExact[VALUE(0x1018)] = Const Value(VALUE(0x1018)) + v16:ArrayExact = NewArray v24, v27 CheckInterrupts Return v16 "); @@ -2846,19 +2999,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, MY_MODULE) - v18:ModuleSubclass[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v19:ModuleSubclass[VALUE(0x1008)] = Const Value(VALUE(0x1008)) CheckInterrupts - Return v18 + Return v19 "); } @@ -2872,14 +3026,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, size@0x1008, cme:0x1010) @@ -2900,14 +3055,15 @@ mod hir_opt_tests { // Not specialized assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[0] = Const Value(0) v14:BasicObject = Send v10, :itself, v12 # SendFallbackReason: SendWithoutBlock: unsupported method type Cfunc @@ -2924,22 +3080,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, block_given?@0x1008, cme:0x1010) - v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v20:CPtr = GetLEP - v21:BoolExact = IsBlockGiven v20 + v20:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v21:CPtr = GetLEP + v22:BoolExact = IsBlockGiven v21 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v21 + Return v22 "); } @@ -2951,21 +3108,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("TEST"), @r" fn block in @:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, block_given?@0x1008, cme:0x1010) - v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v20:FalseClass = Const Value(false) + v20:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v21:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v20 + Return v21 "); } @@ -2980,17 +3138,18 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, block_given?@0x1008, cme:0x1010) - v23:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v24:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_cfunc_optimized_send_count v15:Fixnum[5] = Const Value(5) CheckInterrupts @@ -3005,21 +3164,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, zero?@0x1008, cme:0x1010) IncrCounter inline_iseq_optimized_send_count - v23:BasicObject = InvokeBuiltin leaf , v13 + v24:BasicObject = InvokeBuiltin leaf , v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -3033,25 +3194,27 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 v8:NilClass = Const Value(nil) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:NilClass): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:NilClass): v16:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v17:ArrayExact = ArrayDup v16 PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, first@0x1010, cme:0x1018) IncrCounter inline_iseq_optimized_send_count - v31:BasicObject = InvokeBuiltin leaf , v17 + v32:BasicObject = InvokeBuiltin leaf , v17 CheckInterrupts - Return v31 + Return v32 "); } @@ -3065,24 +3228,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, M) - v20:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(Module@0x1010) PatchPoint MethodRedefined(Module@0x1010, class@0x1018, cme:0x1020) IncrCounter inline_iseq_optimized_send_count - v26:Class[Module@0x1010] = Const Value(VALUE(0x1010)) + v27:Class[Module@0x1010] = Const Value(VALUE(0x1010)) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v26 + Return v27 "); } @@ -3101,21 +3265,23 @@ mod hir_opt_tests { assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :c, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :c@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v22:BasicObject = SendDirect v21, 0x1038, :foo (0x1048) + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v23:BasicObject = SendDirect v22, 0x1038, :foo (0x1048) CheckInterrupts - Return v22 + Return v23 "); } @@ -3130,22 +3296,23 @@ mod hir_opt_tests { assert_eq!(VALUE::fixnum_from_usize(3), result); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) v13:Fixnum[2] = Const Value(2) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v22:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v23:BasicObject = SendDirect v22, 0x1038, :foo (0x1048), v11, v13 + v23:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v24:BasicObject = SendDirect v23, 0x1038, :foo (0x1048), v11, v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -3163,20 +3330,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v31:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v8, HeapObject[class_exact*:Object@VALUE(0x1000)] + v32:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v8, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count v19:BasicObject = GetLocal :a, l0, EP@3 PatchPoint NoEPEscape(test) @@ -3195,14 +3363,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) IncrCounter complex_arg_pass_param_rest v13:BasicObject = Send v6, :foo, v11 # SendFallbackReason: Complex argument passing @@ -3220,14 +3389,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[10] = Const Value(10) IncrCounter complex_arg_pass_param_post v13:BasicObject = Send v6, :foo, v11 # SendFallbackReason: Complex argument passing @@ -3246,22 +3416,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) v13:Fixnum[2] = Const Value(2) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v22:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v23:BasicObject = SendDirect v22, 0x1038, :foo (0x1048), v11, v13 + v23:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v24:BasicObject = SendDirect v23, 0x1038, :foo (0x1048), v11, v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -3275,23 +3446,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[3] = Const Value(3) v13:Fixnum[1] = Const Value(1) v15:Fixnum[2] = Const Value(2) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v24:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v26:BasicObject = SendDirect v24, 0x1038, :foo (0x1048), v13, v15, v11 + v25:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v27:BasicObject = SendDirect v25, 0x1038, :foo (0x1048), v13, v15, v11 CheckInterrupts - Return v26 + Return v27 "); } @@ -3305,23 +3477,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[0] = Const Value(0) v13:Fixnum[2] = Const Value(2) v15:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v24:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v26:BasicObject = SendDirect v24, 0x1038, :foo (0x1048), v11, v15, v13 + v25:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v27:BasicObject = SendDirect v25, 0x1038, :foo (0x1048), v11, v15, v13 CheckInterrupts - Return v26 + Return v27 "); } @@ -3335,22 +3508,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[0] = Const Value(0) v13:Fixnum[2] = Const Value(2) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v22:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v23:BasicObject = SendDirect v22, 0x1038, :foo (0x1048), v11, v13 + v23:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v24:BasicObject = SendDirect v23, 0x1038, :foo (0x1048), v11, v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -3364,30 +3538,31 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) v13:Fixnum[3] = Const Value(3) v15:Fixnum[4] = Const Value(4) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v37:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v38:BasicObject = SendDirect v37, 0x1038, :foo (0x1048), v11, v13, v15 + v38:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v39:BasicObject = SendDirect v38, 0x1038, :foo (0x1048), v11, v13, v15 v20:Fixnum[1] = Const Value(1) v22:Fixnum[2] = Const Value(2) v24:Fixnum[4] = Const Value(4) v26:Fixnum[3] = Const Value(3) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v41:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v43:BasicObject = SendDirect v41, 0x1038, :foo (0x1048), v20, v22, v26, v24 - v30:ArrayExact = NewArray v38, v43 + v42:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v44:BasicObject = SendDirect v42, 0x1038, :foo (0x1048), v20, v22, v26, v24 + v30:ArrayExact = NewArray v39, v44 CheckInterrupts Return v30 "); @@ -3403,30 +3578,31 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) v13:Fixnum[3] = Const Value(3) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v35:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v36:Fixnum[4] = Const Value(4) - v38:BasicObject = SendDirect v35, 0x1038, :foo (0x1048), v11, v13, v36 + v36:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v37:Fixnum[4] = Const Value(4) + v39:BasicObject = SendDirect v36, 0x1038, :foo (0x1048), v11, v13, v37 v18:Fixnum[1] = Const Value(1) v20:Fixnum[2] = Const Value(2) v22:Fixnum[40] = Const Value(40) v24:Fixnum[30] = Const Value(30) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v41:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v43:BasicObject = SendDirect v41, 0x1038, :foo (0x1048), v18, v20, v24, v22 - v28:ArrayExact = NewArray v38, v43 + v42:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v44:BasicObject = SendDirect v42, 0x1038, :foo (0x1048), v18, v20, v24, v22 + v28:ArrayExact = NewArray v39, v44 CheckInterrupts Return v28 "); @@ -3442,27 +3618,28 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[6] = Const Value(6) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, target@0x1008, cme:0x1010) - v48:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v49:BasicObject = SendDirect v48, 0x1038, :target (0x1048), v11 + v49:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v50:BasicObject = SendDirect v49, 0x1038, :target (0x1048), v11 v16:Fixnum[10] = Const Value(10) v18:Fixnum[20] = Const Value(20) v20:Fixnum[30] = Const Value(30) v22:Fixnum[6] = Const Value(6) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, target@0x1008, cme:0x1010) - v52:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v53:BasicObject = SendDirect v52, 0x1038, :target (0x1048), v16, v18, v20, v22 + v53:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v54:BasicObject = SendDirect v53, 0x1038, :target (0x1048), v16, v18, v20, v22 v27:Fixnum[10] = Const Value(10) v29:Fixnum[20] = Const Value(20) v31:Fixnum[30] = Const Value(30) @@ -3470,7 +3647,7 @@ mod hir_opt_tests { v35:Fixnum[50] = Const Value(50) v37:Fixnum[60] = Const Value(60) v39:BasicObject = Send v6, :target, v27, v29, v31, v33, v35, v37 # SendFallbackReason: Too many arguments for LIR - v41:ArrayExact = NewArray v49, v53, v39 + v41:ArrayExact = NewArray v50, v54, v39 CheckInterrupts Return v41 "); @@ -3486,21 +3663,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[2] = Const Value(2) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v20:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v21:BasicObject = SendDirect v20, 0x1038, :foo (0x1048), v11 + v21:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v22:BasicObject = SendDirect v21, 0x1038, :foo (0x1048), v11 CheckInterrupts - Return v21 + Return v22 "); } @@ -3514,14 +3692,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) IncrCounter complex_arg_pass_param_kwrest v13:BasicObject = Send v6, :foo, v11 # SendFallbackReason: Complex argument passing @@ -3540,21 +3719,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v19:Fixnum[1] = Const Value(1) - v21:BasicObject = SendDirect v18, 0x1038, :foo (0x1048), v19 + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v20:Fixnum[1] = Const Value(1) + v22:BasicObject = SendDirect v19, 0x1038, :foo (0x1048), v20 CheckInterrupts - Return v21 + Return v22 "); } @@ -3568,14 +3748,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v12:HashExact = HashDup v11 IncrCounter complex_arg_pass_caller_kw_splat @@ -3595,14 +3776,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): IncrCounter complex_arg_pass_param_kwrest v11:BasicObject = Send v6, :foo # SendFallbackReason: Complex argument passing CheckInterrupts @@ -3619,14 +3801,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v12:StringExact = StringCopy v11 v14:Fixnum[1] = Const Value(1) @@ -3650,17 +3833,19 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@5 v3:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :s@1 v8:NilClass = Const Value(nil) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:NilClass): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:NilClass): v16:ArrayExact = NewArray v21:TrueClass = Const Value(true) IncrCounter complex_arg_pass_caller_kwarg @@ -3680,14 +3865,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = GetConstantPath 0x1000 CheckInterrupts Return v11 @@ -3703,14 +3889,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = GetConstantPath 0x1000 CheckInterrupts Return v11 @@ -3725,19 +3912,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Kernel) - v18:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v19:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) CheckInterrupts - Return v18 + Return v19 "); } @@ -3755,19 +3943,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:8: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Foo::Bar::C) - v18:Class[Foo::Bar::C@0x1008] = Const Value(VALUE(0x1008)) + v19:Class[Foo::Bar::C@0x1008] = Const Value(VALUE(0x1008)) CheckInterrupts - Return v18 + Return v19 "); } @@ -3780,27 +3969,28 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, C) - v43:Class[C@0x1008] = Const Value(VALUE(0x1008)) + v44:Class[C@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) PatchPoint MethodRedefined(C@0x1008, new@0x1009, cme:0x1010) - v46:HeapObject[class_exact:C] = ObjectAllocClass C:VALUE(0x1008) + v47:HeapObject[class_exact:C] = ObjectAllocClass C:VALUE(0x1008) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, initialize@0x1038, cme:0x1040) - v50:NilClass = Const Value(nil) + v51:NilClass = Const Value(nil) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts CheckInterrupts - Return v46 + Return v47 "); } @@ -3817,27 +4007,28 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, C) - v46:Class[C@0x1008] = Const Value(VALUE(0x1008)) + v47:Class[C@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) v16:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(C@0x1008, new@0x1009, cme:0x1010) - v49:HeapObject[class_exact:C] = ObjectAllocClass C:VALUE(0x1008) + v50:HeapObject[class_exact:C] = ObjectAllocClass C:VALUE(0x1008) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, initialize@0x1038, cme:0x1040) - v52:BasicObject = SendDirect v49, 0x1068, :initialize (0x1078), v16 + v53:BasicObject = SendDirect v50, 0x1068, :initialize (0x1078), v16 CheckInterrupts CheckInterrupts - Return v49 + Return v50 "); } @@ -3849,27 +4040,28 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Object) - v43:Class[Object@0x1008] = Const Value(VALUE(0x1008)) + v44:Class[Object@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) PatchPoint MethodRedefined(Object@0x1008, new@0x1009, cme:0x1010) - v46:ObjectExact = ObjectAllocClass Object:VALUE(0x1008) + v47:ObjectExact = ObjectAllocClass Object:VALUE(0x1008) PatchPoint NoSingletonClass(Object@0x1008) PatchPoint MethodRedefined(Object@0x1008, initialize@0x1038, cme:0x1040) - v50:NilClass = Const Value(nil) + v51:NilClass = Const Value(nil) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts CheckInterrupts - Return v46 + Return v47 "); } @@ -3881,27 +4073,28 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, BasicObject) - v43:Class[BasicObject@0x1008] = Const Value(VALUE(0x1008)) + v44:Class[BasicObject@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) PatchPoint MethodRedefined(BasicObject@0x1008, new@0x1009, cme:0x1010) - v46:BasicObjectExact = ObjectAllocClass BasicObject:VALUE(0x1008) + v47:BasicObjectExact = ObjectAllocClass BasicObject:VALUE(0x1008) PatchPoint NoSingletonClass(BasicObject@0x1008) PatchPoint MethodRedefined(BasicObject@0x1008, initialize@0x1038, cme:0x1040) - v50:NilClass = Const Value(nil) + v51:NilClass = Const Value(nil) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts CheckInterrupts - Return v46 + Return v47 "); } @@ -3913,25 +4106,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Hash) - v43:Class[Hash@0x1008] = Const Value(VALUE(0x1008)) + v44:Class[Hash@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) PatchPoint MethodRedefined(Hash@0x1008, new@0x1009, cme:0x1010) - v46:HashExact = ObjectAllocClass Hash:VALUE(0x1008) + v47:HashExact = ObjectAllocClass Hash:VALUE(0x1008) IncrCounter complex_arg_pass_param_block - v20:BasicObject = Send v46, :initialize # SendFallbackReason: Complex argument passing + v20:BasicObject = Send v47, :initialize # SendFallbackReason: Complex argument passing CheckInterrupts CheckInterrupts - Return v46 + Return v47 "); assert_snapshot!(inspect("test"), @"{}"); } @@ -3944,25 +4138,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Array) - v46:Class[Array@0x1008] = Const Value(VALUE(0x1008)) + v47:Class[Array@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) v16:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Array@0x1008, new@0x1009, cme:0x1010) PatchPoint NoSingletonClass(Class@0x1038) PatchPoint MethodRedefined(Class@0x1038, new@0x1009, cme:0x1010) - v57:BasicObject = CCallVariadic v46, :Array.new@0x1040, v16 + v58:BasicObject = CCallVariadic v47, :Array.new@0x1040, v16 CheckInterrupts - Return v57 + Return v58 "); } @@ -3974,24 +4169,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Set) - v43:Class[Set@0x1008] = Const Value(VALUE(0x1008)) + v44:Class[Set@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) PatchPoint MethodRedefined(Set@0x1008, new@0x1009, cme:0x1010) - v18:HeapBasicObject = ObjectAlloc v43 + v18:HeapBasicObject = ObjectAlloc v44 PatchPoint NoSingletonClass(Set@0x1008) PatchPoint MethodRedefined(Set@0x1008, initialize@0x1038, cme:0x1040) - v49:SetExact = GuardType v18, SetExact - v50:BasicObject = CCallVariadic v49, :Set#initialize@0x1068 + v50:SetExact = GuardType v18, SetExact + v51:BasicObject = CCallVariadic v50, :Set#initialize@0x1068 CheckInterrupts CheckInterrupts Return v18 @@ -4006,24 +4202,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, String) - v43:Class[String@0x1008] = Const Value(VALUE(0x1008)) + v44:Class[String@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) PatchPoint MethodRedefined(String@0x1008, new@0x1009, cme:0x1010) PatchPoint NoSingletonClass(Class@0x1038) PatchPoint MethodRedefined(Class@0x1038, new@0x1009, cme:0x1010) - v54:BasicObject = CCallVariadic v43, :String.new@0x1040 + v55:BasicObject = CCallVariadic v44, :String.new@0x1040 CheckInterrupts - Return v54 + Return v55 "); } @@ -4035,28 +4232,29 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Regexp) - v47:Class[Regexp@0x1008] = Const Value(VALUE(0x1008)) + v48:Class[Regexp@0x1008] = Const Value(VALUE(0x1008)) v13:NilClass = Const Value(nil) v16:StringExact[VALUE(0x1010)] = Const Value(VALUE(0x1010)) v17:StringExact = StringCopy v16 PatchPoint MethodRedefined(Regexp@0x1008, new@0x1018, cme:0x1020) - v50:RegexpExact = ObjectAllocClass Regexp:VALUE(0x1008) + v51:RegexpExact = ObjectAllocClass Regexp:VALUE(0x1008) PatchPoint NoSingletonClass(Regexp@0x1008) PatchPoint MethodRedefined(Regexp@0x1008, initialize@0x1048, cme:0x1050) - v54:BasicObject = CCallVariadic v50, :Regexp#initialize@0x1078, v17 + v55:BasicObject = CCallVariadic v51, :Regexp#initialize@0x1078, v17 CheckInterrupts CheckInterrupts - Return v50 + Return v51 "); } @@ -4067,24 +4265,27 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v18:ArrayExact = NewArray v11, v12 PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, length@0x1008, cme:0x1010) - v29:CInt64 = ArrayLength v18 - v30:Fixnum = BoxFixnum v29 + v30:CInt64 = ArrayLength v18 + v31:Fixnum = BoxFixnum v30 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -4095,24 +4296,27 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v18:ArrayExact = NewArray v11, v12 PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, size@0x1008, cme:0x1010) - v29:CInt64 = ArrayLength v18 - v30:Fixnum = BoxFixnum v29 + v30:CInt64 = ArrayLength v18 + v31:Fixnum = BoxFixnum v30 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -4123,15 +4327,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :block, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :block@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:CPtr = GetEP 0 v15:CInt64 = LoadField v14, :_env_data_index_flags@0x1000 v16:CInt64 = GuardNoBitsSet v15, VM_FRAME_FLAG_MODIFIED_BLOCK_PARAM=CUInt64(512) @@ -4151,23 +4357,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :block, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :block@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:CBool = IsBlockParamModified l0 - IfTrue v13, bb3(v8, v9) + IfTrue v13, bb4(v8, v9) v24:BasicObject = GetBlockParam :block, l0, EP@3 - Jump bb5(v8, v24, v24) - bb3(v14:BasicObject, v15:BasicObject): + Jump bb6(v8, v24, v24) + bb4(v14:BasicObject, v15:BasicObject): v22:BasicObject = GetLocal :block, l0, EP@3 - Jump bb5(v14, v22, v22) - bb5(v26:BasicObject, v27:BasicObject, v28:BasicObject): + Jump bb6(v14, v22, v22) + bb6(v26:BasicObject, v27:BasicObject, v28:BasicObject): CheckInterrupts Return v28 "); @@ -4184,22 +4392,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("test"), @r" fn block in test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:CBool = IsBlockParamModified l1 - IfTrue v10, bb3(v6) + IfTrue v10, bb4(v6) v19:BasicObject = GetBlockParam :block, l1, EP@3 - Jump bb5(v6, v19) - bb3(v11:BasicObject): + Jump bb6(v6, v19) + bb4(v11:BasicObject): v17:BasicObject = GetLocal :block, l1, EP@3 - Jump bb5(v11, v17) - bb5(v21:BasicObject, v22:BasicObject): + Jump bb6(v11, v17) + bb6(v21:BasicObject, v22:BasicObject): CheckInterrupts Return v22 "); @@ -4212,14 +4421,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode IncrCounter getivar_fallback_not_monomorphic v11:BasicObject = GetIvar v6, :@foo @@ -4235,14 +4445,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) PatchPoint SingleRactorMode IncrCounter setivar_fallback_not_monomorphic @@ -4261,20 +4472,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): - v15:HeapBasicObject = GuardType v6, HeapBasicObject - v16:CShape = LoadField v15, :_shape_id@0x1000 - v17:CShape[0x1001] = GuardBitEquals v16, CShape(0x1001) - v18:StringExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): + v16:HeapBasicObject = GuardType v6, HeapBasicObject + v17:CShape = LoadField v16, :_shape_id@0x1000 + v18:CShape[0x1001] = GuardBitEquals v17, CShape(0x1001) + v19:StringExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) CheckInterrupts - Return v18 + Return v19 "); } @@ -4286,20 +4498,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): - v15:HeapBasicObject = GuardType v6, HeapBasicObject - v16:CShape = LoadField v15, :_shape_id@0x1000 - v17:CShape[0x1001] = GuardBitEquals v16, CShape(0x1001) - v18:NilClass = Const Value(nil) + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): + v16:HeapBasicObject = GuardType v6, HeapBasicObject + v17:CShape = LoadField v16, :_shape_id@0x1000 + v18:CShape[0x1001] = GuardBitEquals v17, CShape(0x1001) + v19:NilClass = Const Value(nil) CheckInterrupts - Return v18 + Return v19 "); } @@ -4312,24 +4525,26 @@ mod hir_opt_tests { end test p "); - assert_snapshot!(hir_string("test"), @" + assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :p, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :p@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Proc@0x1000) PatchPoint MethodRedefined(Proc@0x1000, call@0x1008, cme:0x1010) - v23:HeapObject[class_exact:Proc] = GuardType v9, HeapObject[class_exact:Proc] - v24:BasicObject = InvokeProc v23, v14 + v24:HeapObject[class_exact:Proc] = GuardType v9, HeapObject[class_exact:Proc] + v25:BasicObject = InvokeProc v24, v14 CheckInterrupts - Return v24 + Return v25 "); } @@ -4342,24 +4557,26 @@ mod hir_opt_tests { end test p "); - assert_snapshot!(hir_string("test"), @" + assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :p, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :p@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[2] = Const Value(2) PatchPoint NoSingletonClass(Proc@0x1000) PatchPoint MethodRedefined(Proc@0x1000, []@0x1008, cme:0x1010) - v24:HeapObject[class_exact:Proc] = GuardType v9, HeapObject[class_exact:Proc] - v25:BasicObject = InvokeProc v24, v14 + v25:HeapObject[class_exact:Proc] = GuardType v9, HeapObject[class_exact:Proc] + v26:BasicObject = InvokeProc v25, v14 CheckInterrupts - Return v25 + Return v26 "); } @@ -4372,24 +4589,26 @@ mod hir_opt_tests { end test p "); - assert_snapshot!(hir_string("test"), @" + assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :p, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :p@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[3] = Const Value(3) PatchPoint NoSingletonClass(Proc@0x1000) PatchPoint MethodRedefined(Proc@0x1000, yield@0x1008, cme:0x1010) - v23:HeapObject[class_exact:Proc] = GuardType v9, HeapObject[class_exact:Proc] - v24:BasicObject = InvokeProc v23, v14 + v24:HeapObject[class_exact:Proc] = GuardType v9, HeapObject[class_exact:Proc] + v25:BasicObject = InvokeProc v24, v14 CheckInterrupts - Return v24 + Return v25 "); } @@ -4402,24 +4621,26 @@ mod hir_opt_tests { end test p "); - assert_snapshot!(hir_string("test"), @" + assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :p, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :p@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Proc@0x1000) PatchPoint MethodRedefined(Proc@0x1000, ===@0x1008, cme:0x1010) - v23:HeapObject[class_exact:Proc] = GuardType v9, HeapObject[class_exact:Proc] - v24:BasicObject = InvokeProc v23, v14 + v24:HeapObject[class_exact:Proc] = GuardType v9, HeapObject[class_exact:Proc] + v25:BasicObject = InvokeProc v24, v14 CheckInterrupts - Return v24 + Return v25 "); } @@ -4433,19 +4654,21 @@ mod hir_opt_tests { end test p "); - assert_snapshot!(hir_string("test"), @" + assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :p, l0, SP@5 v3:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :p@1 v8:NilClass = Const Value(nil) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:NilClass): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:NilClass): v16:ArrayExact = NewArray v22:ArrayExact = ToArray v16 IncrCounter complex_arg_pass_caller_splat @@ -4464,17 +4687,19 @@ mod hir_opt_tests { end test p "); - assert_snapshot!(hir_string("test"), @" + assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :p, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :p@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) IncrCounter complex_arg_pass_caller_kwarg v16:BasicObject = Send v9, :call, v14 # SendFallbackReason: Complex argument passing @@ -4496,14 +4721,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("TEST"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): IncrCounter definedivar_fallback_not_t_object v10:StringExact|NilClass = DefinedIvar v6, :@a CheckInterrupts @@ -4528,14 +4754,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("TEST"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): IncrCounter definedivar_fallback_not_monomorphic v10:StringExact|NilClass = DefinedIvar v6, :@a CheckInterrupts @@ -4561,14 +4788,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string_proc("TEST"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): IncrCounter definedivar_fallback_too_complex v10:StringExact|NilClass = DefinedIvar v6, :@a CheckInterrupts @@ -4585,21 +4813,22 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[5] = Const Value(5) PatchPoint SingleRactorMode - v20:HeapBasicObject = GuardType v6, HeapBasicObject - v21:CShape = LoadField v20, :_shape_id@0x1000 - v22:CShape[0x1001] = GuardBitEquals v21, CShape(0x1001) - StoreField v20, :@foo@0x1002, v10 - WriteBarrier v20, v10 + v21:HeapBasicObject = GuardType v6, HeapBasicObject + v22:CShape = LoadField v21, :_shape_id@0x1000 + v23:CShape[0x1001] = GuardBitEquals v22, CShape(0x1001) + StoreField v21, :@foo@0x1002, v10 + WriteBarrier v21, v10 CheckInterrupts Return v10 "); @@ -4613,23 +4842,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[5] = Const Value(5) PatchPoint SingleRactorMode - v20:HeapBasicObject = GuardType v6, HeapBasicObject - v21:CShape = LoadField v20, :_shape_id@0x1000 - v22:CShape[0x1001] = GuardBitEquals v21, CShape(0x1001) - StoreField v20, :@foo@0x1002, v10 - WriteBarrier v20, v10 - v25:CShape[0x1003] = Const CShape(0x1003) - StoreField v20, :_shape_id@0x1000, v25 + v21:HeapBasicObject = GuardType v6, HeapBasicObject + v22:CShape = LoadField v21, :_shape_id@0x1000 + v23:CShape[0x1001] = GuardBitEquals v22, CShape(0x1001) + StoreField v21, :@foo@0x1002, v10 + WriteBarrier v21, v10 + v26:CShape[0x1003] = Const CShape(0x1003) + StoreField v21, :_shape_id@0x1000, v26 CheckInterrupts Return v10 "); @@ -4646,32 +4876,33 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) PatchPoint SingleRactorMode - v27:HeapBasicObject = GuardType v6, HeapBasicObject - v28:CShape = LoadField v27, :_shape_id@0x1000 - v29:CShape[0x1001] = GuardBitEquals v28, CShape(0x1001) - StoreField v27, :@foo@0x1002, v10 - WriteBarrier v27, v10 - v32:CShape[0x1003] = Const CShape(0x1003) - StoreField v27, :_shape_id@0x1000, v32 + v28:HeapBasicObject = GuardType v6, HeapBasicObject + v29:CShape = LoadField v28, :_shape_id@0x1000 + v30:CShape[0x1001] = GuardBitEquals v29, CShape(0x1001) + StoreField v28, :@foo@0x1002, v10 + WriteBarrier v28, v10 + v33:CShape[0x1003] = Const CShape(0x1003) + StoreField v28, :_shape_id@0x1000, v33 v14:HeapBasicObject = RefineType v6, HeapBasicObject v17:Fixnum[2] = Const Value(2) PatchPoint SingleRactorMode - v35:CShape = LoadField v14, :_shape_id@0x1000 - v36:CShape[0x1003] = GuardBitEquals v35, CShape(0x1003) + v36:CShape = LoadField v14, :_shape_id@0x1000 + v37:CShape[0x1003] = GuardBitEquals v36, CShape(0x1003) StoreField v14, :@bar@0x1004, v17 WriteBarrier v14, v17 - v39:CShape[0x1005] = Const CShape(0x1005) - StoreField v14, :_shape_id@0x1000, v39 + v40:CShape[0x1005] = Const CShape(0x1005) + StoreField v14, :_shape_id@0x1000, v40 CheckInterrupts Return v17 "); @@ -4690,14 +4921,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("TEST"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[5] = Const Value(5) PatchPoint SingleRactorMode IncrCounter setivar_fallback_not_t_object @@ -4724,14 +4956,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("TEST"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[5] = Const Value(5) PatchPoint SingleRactorMode IncrCounter setivar_fallback_not_monomorphic @@ -4759,14 +4992,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string_proc("TEST"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[5] = Const Value(5) PatchPoint SingleRactorMode IncrCounter setivar_fallback_too_complex @@ -4791,14 +5025,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string_proc("TEST"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[5] = Const Value(5) PatchPoint SingleRactorMode IncrCounter setivar_fallback_new_shape_too_complex @@ -4815,14 +5050,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE) v11:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts @@ -4840,14 +5076,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): SideExit PatchPoint(BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE)) "); } @@ -4859,14 +5096,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE) v11:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) PatchPoint BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE) @@ -4882,19 +5120,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:HashExact = NewHash PatchPoint NoSingletonClass(Hash@0x1000) PatchPoint MethodRedefined(Hash@0x1000, dup@0x1008, cme:0x1010) - v22:BasicObject = CCallWithFrame v10, :Kernel#dup@0x1038 - v14:BasicObject = Send v22, :freeze # SendFallbackReason: Uncategorized(opt_send_without_block) + v23:BasicObject = CCallWithFrame v10, :Kernel#dup@0x1038 + v14:BasicObject = Send v23, :freeze # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v14 "); @@ -4907,14 +5146,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:HashExact = NewHash v12:NilClass = Const Value(nil) v14:BasicObject = Send v10, :freeze, v12 # SendFallbackReason: SendWithoutBlock: unsupported method type Cfunc @@ -4930,14 +5170,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts @@ -4952,14 +5193,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) @@ -4975,19 +5217,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, dup@0x1008, cme:0x1010) - v22:BasicObject = CCallWithFrame v10, :Kernel#dup@0x1038 - v14:BasicObject = Send v22, :freeze # SendFallbackReason: Uncategorized(opt_send_without_block) + v23:BasicObject = CCallWithFrame v10, :Kernel#dup@0x1038 + v14:BasicObject = Send v23, :freeze # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v14 "); @@ -5000,14 +5243,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray v12:NilClass = Const Value(nil) v14:BasicObject = Send v10, :freeze, v12 # SendFallbackReason: SendWithoutBlock: unsupported method type Cfunc @@ -5023,14 +5267,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE) v11:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts @@ -5045,14 +5290,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE) v11:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE) @@ -5068,20 +5314,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:StringExact = StringCopy v10 PatchPoint NoSingletonClass(String@0x1008) PatchPoint MethodRedefined(String@0x1008, dup@0x1010, cme:0x1018) - v23:BasicObject = CCallWithFrame v11, :String#dup@0x1040 - v15:BasicObject = Send v23, :freeze # SendFallbackReason: Uncategorized(opt_send_without_block) + v24:BasicObject = CCallWithFrame v11, :String#dup@0x1040 + v15:BasicObject = Send v24, :freeze # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v15 "); @@ -5094,14 +5341,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:StringExact = StringCopy v10 v13:NilClass = Const Value(nil) @@ -5118,14 +5366,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_UMINUS) v11:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts @@ -5140,14 +5389,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE) v11:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_UMINUS) @@ -5163,20 +5413,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:StringExact = StringCopy v10 PatchPoint NoSingletonClass(String@0x1008) PatchPoint MethodRedefined(String@0x1008, dup@0x1010, cme:0x1018) - v23:BasicObject = CCallWithFrame v11, :String#dup@0x1040 - v15:BasicObject = Send v23, :-@ # SendFallbackReason: Uncategorized(opt_send_without_block) + v24:BasicObject = CCallWithFrame v11, :String#dup@0x1040 + v15:BasicObject = Send v24, :-@ # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v15 "); @@ -5189,14 +5440,15 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v13:StringExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) v14:StringExact = StringCopy v13 @@ -5213,14 +5465,15 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v12:Fixnum[1] = Const Value(1) v15:BasicObject = ObjToString v12 @@ -5242,19 +5495,21 @@ mod hir_opt_tests { assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) PatchPoint NoSingletonClass(String@0x1008) - v27:String = GuardType v9, String - v21:StringExact = StringConcat v13, v27 + v28:String = GuardType v9, String + v21:StringExact = StringConcat v13, v28 CheckInterrupts Return v21 "); @@ -5274,19 +5529,21 @@ mod hir_opt_tests { assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) PatchPoint NoSingletonClass(MyString@0x1008) - v27:String = GuardType v9, String - v21:StringExact = StringConcat v13, v27 + v28:String = GuardType v9, String + v21:StringExact = StringConcat v13, v28 CheckInterrupts Return v21 "); @@ -5303,21 +5560,23 @@ mod hir_opt_tests { assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) - v26:ArrayExact = GuardType v9, ArrayExact + v27:ArrayExact = GuardType v9, ArrayExact PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, to_s@0x1010, cme:0x1018) - v31:BasicObject = CCallWithFrame v26, :Array#to_s@0x1040 - v19:String = AnyToString v9, str: v31 + v32:BasicObject = CCallWithFrame v27, :Array#to_s@0x1040 + v19:String = AnyToString v9, str: v32 v21:StringExact = StringConcat v13, v19 CheckInterrupts Return v21 @@ -5335,16 +5594,17 @@ mod hir_opt_tests { assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:NilClass = Const Value(nil) CheckInterrupts v21:NilClass = Const Value(nil) @@ -5364,16 +5624,17 @@ mod hir_opt_tests { assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:Fixnum[1] = Const Value(1) CheckInterrupts v23:Fixnum[1] = RefineType v13, NotNil @@ -5393,29 +5654,30 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, S) - v23:ArrayExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v24:ArrayExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) v13:Fixnum[0] = Const Value(0) PatchPoint NoSingletonClass(Array@0x1010) PatchPoint MethodRedefined(Array@0x1010, []@0x1018, cme:0x1020) - v27:CInt64[0] = UnboxFixnum v13 - v28:CInt64 = ArrayLength v23 - v29:CInt64[0] = GuardLess v27, v28 - v30:CInt64[0] = Const CInt64(0) - v31:CInt64[0] = GuardGreaterEq v29, v30 - v32:BasicObject = ArrayAref v23, v31 + v28:CInt64[0] = UnboxFixnum v13 + v29:CInt64 = ArrayLength v24 + v30:CInt64[0] = GuardLess v28, v29 + v31:CInt64[0] = Const CInt64(0) + v32:CInt64[0] = GuardGreaterEq v30, v31 + v33:BasicObject = ArrayAref v24, v32 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v32 + Return v33 "); // TODO(max): Check the result of `S[0] = 5; test` using `inspect` to make sure that we // actually do the load at run-time. @@ -5428,28 +5690,29 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v13:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, []@0x1010, cme:0x1018) - v24:CInt64[1] = UnboxFixnum v13 - v25:CInt64 = ArrayLength v11 - v26:CInt64[1] = GuardLess v24, v25 - v27:CInt64[0] = Const CInt64(0) - v28:CInt64[1] = GuardGreaterEq v26, v27 - v31:Fixnum[5] = Const Value(5) + v25:CInt64[1] = UnboxFixnum v13 + v26:CInt64 = ArrayLength v11 + v27:CInt64[1] = GuardLess v25, v26 + v28:CInt64[0] = Const CInt64(0) + v29:CInt64[1] = GuardGreaterEq v27, v28 + v32:Fixnum[5] = Const Value(5) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v31 + Return v32 "); } @@ -5460,28 +5723,29 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v13:Fixnum[-3] = Const Value(-3) PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, []@0x1010, cme:0x1018) - v24:CInt64[-3] = UnboxFixnum v13 - v25:CInt64 = ArrayLength v11 - v26:CInt64[-3] = GuardLess v24, v25 - v27:CInt64[0] = Const CInt64(0) - v28:CInt64[-3] = GuardGreaterEq v26, v27 - v31:Fixnum[4] = Const Value(4) + v25:CInt64[-3] = UnboxFixnum v13 + v26:CInt64 = ArrayLength v11 + v27:CInt64[-3] = GuardLess v25, v26 + v28:CInt64[0] = Const CInt64(0) + v29:CInt64[-3] = GuardGreaterEq v27, v28 + v32:Fixnum[4] = Const Value(4) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v31 + Return v32 "); } @@ -5492,28 +5756,29 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v13:Fixnum[-10] = Const Value(-10) PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, []@0x1010, cme:0x1018) - v24:CInt64[-10] = UnboxFixnum v13 - v25:CInt64 = ArrayLength v11 - v26:CInt64[-10] = GuardLess v24, v25 - v27:CInt64[0] = Const CInt64(0) - v28:CInt64[-10] = GuardGreaterEq v26, v27 - v31:NilClass = Const Value(nil) + v25:CInt64[-10] = UnboxFixnum v13 + v26:CInt64 = ArrayLength v11 + v27:CInt64[-10] = GuardLess v25, v26 + v28:CInt64[0] = Const CInt64(0) + v29:CInt64[-10] = GuardGreaterEq v27, v28 + v32:NilClass = Const Value(nil) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v31 + Return v32 "); } @@ -5524,28 +5789,29 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v13:Fixnum[10] = Const Value(10) PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, []@0x1010, cme:0x1018) - v24:CInt64[10] = UnboxFixnum v13 - v25:CInt64 = ArrayLength v11 - v26:CInt64[10] = GuardLess v24, v25 - v27:CInt64[0] = Const CInt64(0) - v28:CInt64[10] = GuardGreaterEq v26, v27 - v31:NilClass = Const Value(nil) + v25:CInt64[10] = UnboxFixnum v13 + v26:CInt64 = ArrayLength v11 + v27:CInt64[10] = GuardLess v25, v26 + v28:CInt64[0] = Const CInt64(0) + v29:CInt64[10] = GuardGreaterEq v27, v28 + v32:NilClass = Const Value(nil) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v31 + Return v32 "); } @@ -5559,22 +5825,23 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v13:Fixnum[10] = Const Value(10) PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, []@0x1010, cme:0x1018) - v23:BasicObject = SendDirect v11, 0x1040, :[] (0x1050), v13 + v24:BasicObject = SendDirect v11, 0x1040, :[] (0x1050), v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -5591,15 +5858,17 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v16:Fixnum[1] = Const Value(1) v18:Fixnum[10] = Const Value(10) v22:BasicObject = Send v9, :[]=, v16, v18 # SendFallbackReason: Uncategorized(opt_aset) @@ -5618,21 +5887,22 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:ArrayExact = ArrayDup v10 PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, max@0x1010, cme:0x1018) - v20:BasicObject = SendDirect v11, 0x1040, :max (0x1050) + v21:BasicObject = SendDirect v11, 0x1040, :max (0x1050) CheckInterrupts - Return v20 + Return v21 "); } @@ -5648,19 +5918,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, MY_SET) - v18:SetExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v19:SetExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) CheckInterrupts - Return v18 + Return v19 "); } @@ -5671,14 +5942,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:RegexpExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts Return v10 @@ -5696,27 +5968,28 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, zero@0x1008, cme:0x1010) - v22:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v23:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v30:StaticSymbol[:b] = Const Value(VALUE(0x1038)) + v31:StaticSymbol[:b] = Const Value(VALUE(0x1038)) PatchPoint SingleRactorMode PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, one@0x1040, cme:0x1048) - v27:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v28:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -5729,14 +6002,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[100] = Const Value(100) v13:BasicObject = Send v6, :identity, v11 # SendFallbackReason: Bmethod: Proc object is not defined by an ISEQ CheckInterrupts @@ -5753,14 +6027,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = Send v6, 0x1000, :bmethod # SendFallbackReason: Send: unsupported method type Bmethod CheckInterrupts Return v11 @@ -5780,17 +6055,18 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Foo) - v22:Class[Foo@0x1008] = Const Value(VALUE(0x1008)) + v23:Class[Foo@0x1008] = Const Value(VALUE(0x1008)) v13:Fixnum[100] = Const Value(100) PatchPoint NoSingletonClass(Class@0x1010) PatchPoint MethodRedefined(Class@0x1010, identity@0x1018, cme:0x1020) @@ -5807,20 +6083,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:NilClass = Const Value(nil) PatchPoint MethodRedefined(NilClass@0x1000, nil?@0x1008, cme:0x1010) - v20:TrueClass = Const Value(true) + v21:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v20 + Return v21 "); } @@ -5834,14 +6111,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:NilClass = Const Value(nil) PatchPoint MethodRedefined(NilClass@0x1000, nil?@0x1008, cme:0x1010) IncrCounter inline_cfunc_optimized_send_count @@ -5858,20 +6136,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, nil?@0x1008, cme:0x1010) - v20:FalseClass = Const Value(false) + v21:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v20 + Return v21 "); } @@ -5885,14 +6164,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1000, nil?@0x1008, cme:0x1010) IncrCounter inline_cfunc_optimized_send_count @@ -5911,21 +6191,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :val@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(NilClass@0x1000, nil?@0x1008, cme:0x1010) - v22:NilClass = GuardType v9, NilClass - v23:TrueClass = Const Value(true) + v23:NilClass = GuardType v9, NilClass + v24:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v23 + Return v24 "); } @@ -5938,21 +6220,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :val@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(FalseClass@0x1000, nil?@0x1008, cme:0x1010) - v22:FalseClass = GuardType v9, FalseClass - v23:FalseClass = Const Value(false) + v23:FalseClass = GuardType v9, FalseClass + v24:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v23 + Return v24 "); } @@ -5965,21 +6249,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :val@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(TrueClass@0x1000, nil?@0x1008, cme:0x1010) - v22:TrueClass = GuardType v9, TrueClass - v23:FalseClass = Const Value(false) + v23:TrueClass = GuardType v9, TrueClass + v24:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v23 + Return v24 "); } @@ -5992,21 +6278,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :val@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Symbol@0x1000, nil?@0x1008, cme:0x1010) - v22:StaticSymbol = GuardType v9, StaticSymbol - v23:FalseClass = Const Value(false) + v23:StaticSymbol = GuardType v9, StaticSymbol + v24:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v23 + Return v24 "); } @@ -6019,21 +6307,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :val@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, nil?@0x1008, cme:0x1010) - v22:Fixnum = GuardType v9, Fixnum - v23:FalseClass = Const Value(false) + v23:Fixnum = GuardType v9, Fixnum + v24:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v23 + Return v24 "); } @@ -6046,21 +6336,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :val@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Float@0x1000, nil?@0x1008, cme:0x1010) - v22:Flonum = GuardType v9, Flonum - v23:FalseClass = Const Value(false) + v23:Flonum = GuardType v9, Flonum + v24:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v23 + Return v24 "); } @@ -6073,22 +6365,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :val@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, nil?@0x1008, cme:0x1010) - v23:StringExact = GuardType v9, StringExact - v24:FalseClass = Const Value(false) + v24:StringExact = GuardType v9, StringExact + v25:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -6101,22 +6395,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, !@0x1008, cme:0x1010) - v23:ArrayExact = GuardType v9, ArrayExact - v24:FalseClass = Const Value(false) + v24:ArrayExact = GuardType v9, ArrayExact + v25:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -6129,21 +6425,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(FalseClass@0x1000, !@0x1008, cme:0x1010) - v22:FalseClass = GuardType v9, FalseClass - v23:TrueClass = Const Value(true) + v23:FalseClass = GuardType v9, FalseClass + v24:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v23 + Return v24 "); } @@ -6156,21 +6454,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(NilClass@0x1000, !@0x1008, cme:0x1010) - v22:NilClass = GuardType v9, NilClass - v23:TrueClass = Const Value(true) + v23:NilClass = GuardType v9, NilClass + v24:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v23 + Return v24 "); } @@ -6186,33 +6486,35 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): CheckInterrupts v15:CBool = Test v9 v16:Falsy = RefineType v9, Falsy - IfFalse v15, bb3(v8, v16) + IfFalse v15, bb4(v8, v16) v18:Truthy = RefineType v9, Truthy v20:FalseClass = Const Value(false) CheckInterrupts - Jump bb4(v8, v18, v20) - bb3(v24:BasicObject, v25:Falsy): + Jump bb5(v8, v18, v20) + bb4(v24:BasicObject, v25:Falsy): v28:NilClass = Const Value(nil) - Jump bb4(v24, v25, v28) - bb4(v30:BasicObject, v31:BasicObject, v32:Falsy): + Jump bb5(v24, v25, v28) + bb5(v30:BasicObject, v31:BasicObject, v32:Falsy): PatchPoint MethodRedefined(NilClass@0x1000, !@0x1008, cme:0x1010) - v43:NilClass = GuardType v32, NilClass - v44:TrueClass = Const Value(true) + v44:NilClass = GuardType v32, NilClass + v45:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v44 + Return v45 "); } @@ -6225,25 +6527,27 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, empty?@0x1008, cme:0x1010) - v23:ArrayExact = GuardType v9, ArrayExact - v24:CInt64 = ArrayLength v23 - v25:CInt64[0] = Const CInt64(0) - v26:CBool = IsBitEqual v24, v25 - v27:BoolExact = BoxBool v26 + v24:ArrayExact = GuardType v9, ArrayExact + v25:CInt64 = ArrayLength v24 + v26:CInt64[0] = Const CInt64(0) + v27:CBool = IsBitEqual v25, v26 + v28:BoolExact = BoxBool v27 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v27 + Return v28 "); } @@ -6256,22 +6560,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(Hash@0x1000) PatchPoint MethodRedefined(Hash@0x1000, empty?@0x1008, cme:0x1010) - v23:HashExact = GuardType v9, HashExact + v24:HashExact = GuardType v9, HashExact IncrCounter inline_cfunc_optimized_send_count - v25:BoolExact = CCall v23, :Hash#empty?@0x1038 + v26:BoolExact = CCall v24, :Hash#empty?@0x1038 CheckInterrupts - Return v25 + Return v26 "); } @@ -6285,24 +6591,27 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, ==@0x1008, cme:0x1010) - v27:HeapObject[class_exact:C] = GuardType v11, HeapObject[class_exact:C] - v28:CBool = IsBitEqual v27, v12 - v29:BoolExact = BoxBool v28 + v28:HeapObject[class_exact:C] = GuardType v11, HeapObject[class_exact:C] + v29:CBool = IsBitEqual v28, v12 + v30:BoolExact = BoxBool v29 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v29 + Return v30 "); } @@ -6315,23 +6624,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, &@0x1008, cme:0x1010) - v26:Fixnum = GuardType v11, Fixnum - v27:Fixnum = GuardType v12, Fixnum - v28:Fixnum = FixnumAnd v26, v27 + v27:Fixnum = GuardType v11, Fixnum + v28:Fixnum = GuardType v12, Fixnum + v29:Fixnum = FixnumAnd v27, v28 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -6344,23 +6656,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, |@0x1008, cme:0x1010) - v26:Fixnum = GuardType v11, Fixnum - v27:Fixnum = GuardType v12, Fixnum - v28:Fixnum = FixnumOr v26, v27 + v27:Fixnum = GuardType v11, Fixnum + v28:Fixnum = GuardType v12, Fixnum + v29:Fixnum = FixnumOr v27, v28 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -6375,21 +6690,22 @@ mod hir_opt_tests { assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:NilClass = Const Value(nil) + v22:NilClass = Const Value(nil) CheckInterrupts - Return v21 + Return v22 "); } @@ -6410,23 +6726,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v24:CShape = LoadField v21, :_shape_id@0x1038 - v25:CShape[0x1039] = GuardBitEquals v24, CShape(0x1039) - v26:BasicObject = LoadField v21, :@foo@0x103a + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:CShape = LoadField v22, :_shape_id@0x1038 + v26:CShape[0x1039] = GuardBitEquals v25, CShape(0x1039) + v27:BasicObject = LoadField v22, :@foo@0x103a CheckInterrupts - Return v26 + Return v27 "); } @@ -6450,24 +6768,26 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:13: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v24:CShape = LoadField v21, :_shape_id@0x1038 - v25:CShape[0x1039] = GuardBitEquals v24, CShape(0x1039) - v26:CPtr = LoadField v21, :_as_heap@0x103a - v27:BasicObject = LoadField v26, :@foo@0x103b + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:CShape = LoadField v22, :_shape_id@0x1038 + v26:CShape[0x1039] = GuardBitEquals v25, CShape(0x1039) + v27:CPtr = LoadField v22, :_as_heap@0x103a + v28:BasicObject = LoadField v27, :@foo@0x103b CheckInterrupts - Return v27 + Return v28 "); } @@ -6482,22 +6802,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("M.method(:test)"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode - v16:HeapBasicObject = GuardType v6, HeapBasicObject - v17:CShape = LoadField v16, :_shape_id@0x1000 - v18:CShape[0x1001] = GuardBitEquals v17, CShape(0x1001) - v19:CUInt16[0] = Const CUInt16(0) - v20:BasicObject = CCall v16, :rb_ivar_get_at_no_ractor_check@0x1008, v19 + v17:HeapBasicObject = GuardType v6, HeapBasicObject + v18:CShape = LoadField v17, :_shape_id@0x1000 + v19:CShape[0x1001] = GuardBitEquals v18, CShape(0x1001) + v20:CUInt16[0] = Const CUInt16(0) + v21:BasicObject = CCall v17, :rb_ivar_get_at_no_ractor_check@0x1008, v20 CheckInterrupts - Return v20 + Return v21 "); } @@ -6512,22 +6833,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("C.method(:test)"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode - v16:HeapBasicObject = GuardType v6, HeapBasicObject - v17:CShape = LoadField v16, :_shape_id@0x1000 - v18:CShape[0x1001] = GuardBitEquals v17, CShape(0x1001) - v19:CUInt16[0] = Const CUInt16(0) - v20:BasicObject = CCall v16, :rb_ivar_get_at_no_ractor_check@0x1008, v19 + v17:HeapBasicObject = GuardType v6, HeapBasicObject + v18:CShape = LoadField v17, :_shape_id@0x1000 + v19:CShape[0x1001] = GuardBitEquals v18, CShape(0x1001) + v20:CUInt16[0] = Const CUInt16(0) + v21:BasicObject = CCall v17, :rb_ivar_get_at_no_ractor_check@0x1008, v20 CheckInterrupts - Return v20 + Return v21 "); } @@ -6544,22 +6866,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("TEST"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode - v16:HeapBasicObject = GuardType v6, HeapBasicObject - v17:CShape = LoadField v16, :_shape_id@0x1000 - v18:CShape[0x1001] = GuardBitEquals v17, CShape(0x1001) - v19:CUInt16[0] = Const CUInt16(0) - v20:BasicObject = CCall v16, :rb_ivar_get_at_no_ractor_check@0x1008, v19 + v17:HeapBasicObject = GuardType v6, HeapBasicObject + v18:CShape = LoadField v17, :_shape_id@0x1000 + v19:CShape[0x1001] = GuardBitEquals v18, CShape(0x1001) + v20:CUInt16[0] = Const CUInt16(0) + v21:BasicObject = CCall v17, :rb_ivar_get_at_no_ractor_check@0x1008, v20 CheckInterrupts - Return v20 + Return v21 "); } @@ -6575,14 +6898,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("M.method(:test)"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): SideExit UnhandledYARVInsn(getinstancevariable) "); } @@ -6602,14 +6926,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("M.method(:test)"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = Send v6, :foo # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v11 @@ -6644,36 +6969,38 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:20: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:CBool = HasType v9, HeapObject[class_exact:C] - IfTrue v14, bb4(v8, v9, v9) + IfTrue v14, bb5(v8, v9, v9) v23:CBool = HasType v9, HeapObject[class_exact:C] - IfTrue v23, bb5(v8, v9, v9) + IfTrue v23, bb6(v8, v9, v9) v32:BasicObject = Send v9, :foo # SendFallbackReason: SendWithoutBlock: polymorphic fallback - Jump bb3(v8, v9, v32) - bb4(v15:BasicObject, v16:BasicObject, v17:BasicObject): + Jump bb4(v8, v9, v32) + bb5(v15:BasicObject, v16:BasicObject, v17:BasicObject): v19:HeapObject[class_exact:C] = RefineType v17, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) IncrCounter getivar_fallback_not_monomorphic - v44:BasicObject = GetIvar v19, :@foo - Jump bb3(v15, v16, v44) - bb5(v24:BasicObject, v25:BasicObject, v26:BasicObject): + v45:BasicObject = GetIvar v19, :@foo + Jump bb4(v15, v16, v45) + bb6(v24:BasicObject, v25:BasicObject, v26:BasicObject): v28:HeapObject[class_exact:C] = RefineType v26, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) IncrCounter getivar_fallback_not_monomorphic - v47:BasicObject = GetIvar v28, :@foo - Jump bb3(v24, v25, v47) - bb3(v34:BasicObject, v35:BasicObject, v36:BasicObject): + v48:BasicObject = GetIvar v28, :@foo + Jump bb4(v24, v25, v48) + bb4(v34:BasicObject, v35:BasicObject, v36:BasicObject): CheckInterrupts Return v36 "); @@ -6697,22 +7024,24 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:12: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] IncrCounter getivar_fallback_too_complex - v22:BasicObject = GetIvar v21, :@foo + v23:BasicObject = GetIvar v22, :@foo CheckInterrupts - Return v22 + Return v23 "); } @@ -6724,21 +7053,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:ArrayExact = ArrayDup v10 PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, map@0x1010, cme:0x1018) - v20:BasicObject = SendDirect v11, 0x1040, :map (0x1050) + v21:BasicObject = SendDirect v11, 0x1040, :map (0x1050) CheckInterrupts - Return v20 + Return v21 "); } @@ -6758,26 +7088,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:ArrayExact = NewArray PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, A) - v36:ArrayExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v37:ArrayExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1010, B) - v39:ArrayExact[VALUE(0x1018)] = Const Value(VALUE(0x1018)) + v40:ArrayExact[VALUE(0x1018)] = Const Value(VALUE(0x1018)) PatchPoint NoSingletonClass(Array@0x1020) PatchPoint MethodRedefined(Array@0x1020, zip@0x1028, cme:0x1030) - v43:BasicObject = CCallVariadic v36, :zip@0x1058, v39 + v44:BasicObject = CCallVariadic v37, :zip@0x1058, v40 v24:BasicObject = GetLocal :result, l0, EP@3 PatchPoint NoEPEscape(test) CheckInterrupts @@ -6793,15 +7124,17 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :block, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :block@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:ArrayExact = NewArray v15:CPtr = GetEP 0 v16:CInt64 = LoadField v15, :_env_data_index_flags@0x1000 @@ -6824,15 +7157,17 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :block, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :block@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:ArrayExact = NewArray v15:CPtr = GetEP 0 v16:CInt64 = LoadField v15, :_env_data_index_flags@0x1000 @@ -6859,14 +7194,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string_proc("test"), @r" fn block in test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray v12:CPtr = GetEP 1 v13:CInt64 = LoadField v12, :_env_data_index_flags@0x1000 @@ -6894,20 +7230,21 @@ mod hir_opt_tests { assert_eq!(VALUE::fixnum_from_usize(2), result); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, foo@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] - v19:BasicObject = SendDirect v18, 0x1038, :foo (0x1048) + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v20:BasicObject = SendDirect v19, 0x1038, :foo (0x1048) CheckInterrupts - Return v19 + Return v20 "); } @@ -6925,24 +7262,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, O) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(C@0x1010) PatchPoint MethodRedefined(C@0x1010, foo@0x1018, cme:0x1020) - v25:CShape = LoadField v20, :_shape_id@0x1048 - v26:CShape[0x1049] = GuardBitEquals v25, CShape(0x1049) - v27:NilClass = Const Value(nil) + v26:CShape = LoadField v21, :_shape_id@0x1048 + v27:CShape[0x1049] = GuardBitEquals v26, CShape(0x1049) + v28:NilClass = Const Value(nil) CheckInterrupts - Return v27 + Return v28 "); } @@ -6960,24 +7298,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, O) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(C@0x1010) PatchPoint MethodRedefined(C@0x1010, foo@0x1018, cme:0x1020) - v25:CShape = LoadField v20, :_shape_id@0x1048 - v26:CShape[0x1049] = GuardBitEquals v25, CShape(0x1049) - v27:NilClass = Const Value(nil) + v26:CShape = LoadField v21, :_shape_id@0x1048 + v27:CShape[0x1049] = GuardBitEquals v26, CShape(0x1049) + v28:NilClass = Const Value(nil) CheckInterrupts - Return v27 + Return v28 "); } @@ -6994,23 +7333,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v24:CShape = LoadField v21, :_shape_id@0x1038 - v25:CShape[0x1039] = GuardBitEquals v24, CShape(0x1039) - v26:NilClass = Const Value(nil) + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:CShape = LoadField v22, :_shape_id@0x1038 + v26:CShape[0x1039] = GuardBitEquals v25, CShape(0x1039) + v27:NilClass = Const Value(nil) CheckInterrupts - Return v26 + Return v27 "); } @@ -7027,23 +7368,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v24:CShape = LoadField v21, :_shape_id@0x1038 - v25:CShape[0x1039] = GuardBitEquals v24, CShape(0x1039) - v26:NilClass = Const Value(nil) + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:CShape = LoadField v22, :_shape_id@0x1038 + v26:CShape[0x1039] = GuardBitEquals v25, CShape(0x1039) + v27:NilClass = Const Value(nil) CheckInterrupts - Return v26 + Return v27 "); } @@ -7060,24 +7403,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v16:Fixnum[5] = Const Value(5) PatchPoint MethodRedefined(C@0x1000, foo=@0x1008, cme:0x1010) - v26:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v29:CShape = LoadField v26, :_shape_id@0x1038 - v30:CShape[0x1039] = GuardBitEquals v29, CShape(0x1039) - StoreField v26, :@foo@0x103a, v16 - WriteBarrier v26, v16 - v33:CShape[0x103b] = Const CShape(0x103b) - StoreField v26, :_shape_id@0x1038, v33 + v27:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v30:CShape = LoadField v27, :_shape_id@0x1038 + v31:CShape[0x1039] = GuardBitEquals v30, CShape(0x1039) + StoreField v27, :@foo@0x103a, v16 + WriteBarrier v27, v16 + v34:CShape[0x103b] = Const CShape(0x103b) + StoreField v27, :_shape_id@0x1038, v34 CheckInterrupts Return v16 "); @@ -7096,24 +7441,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v16:Fixnum[5] = Const Value(5) PatchPoint MethodRedefined(C@0x1000, foo=@0x1008, cme:0x1010) - v26:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v29:CShape = LoadField v26, :_shape_id@0x1038 - v30:CShape[0x1039] = GuardBitEquals v29, CShape(0x1039) - StoreField v26, :@foo@0x103a, v16 - WriteBarrier v26, v16 - v33:CShape[0x103b] = Const CShape(0x103b) - StoreField v26, :_shape_id@0x1038, v33 + v27:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v30:CShape = LoadField v27, :_shape_id@0x1038 + v31:CShape[0x1039] = GuardBitEquals v30, CShape(0x1039) + StoreField v27, :@foo@0x103a, v16 + WriteBarrier v27, v16 + v34:CShape[0x103b] = Const CShape(0x103b) + StoreField v27, :_shape_id@0x1038, v34 CheckInterrupts Return v16 "); @@ -7129,21 +7476,23 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v22:BasicObject = LoadField v21, :foo@0x1038 + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v23:BasicObject = LoadField v22, :foo@0x1038 CheckInterrupts - Return v22 + Return v23 "); } @@ -7157,22 +7506,24 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v22:CPtr = LoadField v21, :_as_heap@0x1038 - v23:BasicObject = LoadField v22, :foo@0x1039 + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v23:CPtr = LoadField v22, :_as_heap@0x1038 + v24:BasicObject = LoadField v23, :foo@0x1039 CheckInterrupts - Return v23 + Return v24 "); } @@ -7189,18 +7540,20 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) - v25:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v26:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] v18:Fixnum[5] = Const Value(5) CheckInterrupts Return v18 @@ -7218,23 +7571,26 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@5 v3:BasicObject = GetLocal :v, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :o@1 + v8:BasicObject = LoadArg :v@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo=@0x1008, cme:0x1010) - v29:HeapObject[class_exact:C] = GuardType v11, HeapObject[class_exact:C] - v30:CUInt64 = LoadField v29, :_rbasic_flags@0x1038 - v31:CUInt64 = GuardNoBitsSet v30, RUBY_FL_FREEZE=CUInt64(2048) - StoreField v29, :foo=@0x1039, v12 - WriteBarrier v29, v12 + v30:HeapObject[class_exact:C] = GuardType v11, HeapObject[class_exact:C] + v31:CUInt64 = LoadField v30, :_rbasic_flags@0x1038 + v32:CUInt64 = GuardNoBitsSet v31, RUBY_FL_FREEZE=CUInt64(2048) + StoreField v30, :foo=@0x1039, v12 + WriteBarrier v30, v12 CheckInterrupts Return v12 "); @@ -7251,24 +7607,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@5 v3:BasicObject = GetLocal :v, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :o@1 + v8:BasicObject = LoadArg :v@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo=@0x1008, cme:0x1010) - v29:HeapObject[class_exact:C] = GuardType v11, HeapObject[class_exact:C] - v30:CUInt64 = LoadField v29, :_rbasic_flags@0x1038 - v31:CUInt64 = GuardNoBitsSet v30, RUBY_FL_FREEZE=CUInt64(2048) - v32:CPtr = LoadField v29, :_as_heap@0x1039 - StoreField v32, :foo=@0x103a, v12 - WriteBarrier v29, v12 + v30:HeapObject[class_exact:C] = GuardType v11, HeapObject[class_exact:C] + v31:CUInt64 = LoadField v30, :_rbasic_flags@0x1038 + v32:CUInt64 = GuardNoBitsSet v31, RUBY_FL_FREEZE=CUInt64(2048) + v33:CPtr = LoadField v30, :_as_heap@0x1039 + StoreField v33, :foo=@0x103a, v12 + WriteBarrier v30, v12 CheckInterrupts Return v12 "); @@ -7281,20 +7640,21 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, reverse@0x1008, cme:0x1010) - v20:ArrayExact = CCallWithFrame v10, :Array#reverse@0x1038 + v21:ArrayExact = CCallWithFrame v10, :Array#reverse@0x1038 CheckInterrupts - Return v20 + Return v21 "); } @@ -7308,14 +7668,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, reverse@0x1008, cme:0x1010) @@ -7332,22 +7693,23 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray v12:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v13:StringExact = StringCopy v12 PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, join@0x1010, cme:0x1018) - v23:StringExact = CCallVariadic v10, :Array#join@0x1040, v13 + v24:StringExact = CCallVariadic v10, :Array#join@0x1040, v13 CheckInterrupts - Return v23 + Return v24 "); } @@ -7358,14 +7720,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:StringExact = StringCopy v10 PatchPoint NoSingletonClass(String@0x1008) @@ -7383,14 +7746,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:StringExact = StringCopy v10 PatchPoint NoSingletonClass(String@0x1008) @@ -7409,21 +7773,23 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, to_s@0x1008, cme:0x1010) - v22:StringExact = GuardType v9, StringExact + v23:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v22 + Return v23 "); } @@ -7435,20 +7801,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, to_s@0x1008, cme:0x1010) - v21:Fixnum = GuardType v9, Fixnum - v22:StringExact = CCallVariadic v21, :Integer#to_s@0x1038 + v22:Fixnum = GuardType v9, Fixnum + v23:StringExact = CCallVariadic v22, :Integer#to_s@0x1038 CheckInterrupts - Return v22 + Return v23 "); } @@ -7460,20 +7828,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, to_s@0x1008, cme:0x1010) - v21:Integer = GuardType v9, Integer - v22:StringExact = CCallVariadic v21, :Integer#to_s@0x1038 + v22:Integer = GuardType v9, Integer + v23:StringExact = CCallVariadic v22, :Integer#to_s@0x1038 CheckInterrupts - Return v22 + Return v23 "); } @@ -7485,20 +7855,22 @@ mod hir_opt_tests { "##); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) - v26:Fixnum = GuardType v9, Fixnum + v27:Fixnum = GuardType v9, Fixnum PatchPoint MethodRedefined(Integer@0x1008, to_s@0x1010, cme:0x1018) - v30:StringExact = CCallVariadic v26, :Integer#to_s@0x1040 - v21:StringExact = StringConcat v13, v30 + v31:StringExact = CCallVariadic v27, :Integer#to_s@0x1040 + v21:StringExact = StringConcat v13, v31 CheckInterrupts Return v21 "); @@ -7514,30 +7886,31 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v14:ArrayExact = ArrayDup v13 v19:Fixnum[0] = Const Value(0) PatchPoint NoSingletonClass(Array@0x1008) PatchPoint MethodRedefined(Array@0x1008, []@0x1010, cme:0x1018) - v30:CInt64[0] = UnboxFixnum v19 - v31:CInt64 = ArrayLength v14 - v32:CInt64[0] = GuardLess v30, v31 - v33:CInt64[0] = Const CInt64(0) - v34:CInt64[0] = GuardGreaterEq v32, v33 - v35:BasicObject = ArrayAref v14, v34 + v31:CInt64[0] = UnboxFixnum v19 + v32:CInt64 = ArrayLength v14 + v33:CInt64[0] = GuardLess v31, v32 + v34:CInt64[0] = Const CInt64(0) + v35:CInt64[0] = GuardGreaterEq v33, v34 + v36:BasicObject = ArrayAref v14, v35 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v35 + Return v36 "); } @@ -7551,29 +7924,32 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@5 v3:BasicObject = GetLocal :idx, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :arr@1 + v8:BasicObject = LoadArg :idx@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, []@0x1008, cme:0x1010) - v27:ArrayExact = GuardType v11, ArrayExact - v28:Fixnum = GuardType v12, Fixnum - v29:CInt64 = UnboxFixnum v28 - v30:CInt64 = ArrayLength v27 - v31:CInt64 = GuardLess v29, v30 - v32:CInt64[0] = Const CInt64(0) - v33:CInt64 = GuardGreaterEq v31, v32 - v34:BasicObject = ArrayAref v27, v33 + v28:ArrayExact = GuardType v11, ArrayExact + v29:Fixnum = GuardType v12, Fixnum + v30:CInt64 = UnboxFixnum v29 + v31:CInt64 = ArrayLength v28 + v32:CInt64 = GuardLess v30, v31 + v33:CInt64[0] = Const CInt64(0) + v34:CInt64 = GuardGreaterEq v32, v33 + v35:BasicObject = ArrayAref v28, v34 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v34 + Return v35 "); } @@ -7588,29 +7964,32 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@5 v3:BasicObject = GetLocal :idx, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :arr@1 + v8:BasicObject = LoadArg :idx@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, []@0x1008, cme:0x1010) - v27:ArraySubclass[class_exact:C] = GuardType v11, ArraySubclass[class_exact:C] - v28:Fixnum = GuardType v12, Fixnum - v29:CInt64 = UnboxFixnum v28 - v30:CInt64 = ArrayLength v27 - v31:CInt64 = GuardLess v29, v30 - v32:CInt64[0] = Const CInt64(0) - v33:CInt64 = GuardGreaterEq v31, v32 - v34:BasicObject = ArrayAref v27, v33 + v28:ArraySubclass[class_exact:C] = GuardType v11, ArraySubclass[class_exact:C] + v29:Fixnum = GuardType v12, Fixnum + v30:CInt64 = UnboxFixnum v29 + v31:CInt64 = ArrayLength v28 + v32:CInt64 = GuardLess v30, v31 + v33:CInt64[0] = Const CInt64(0) + v34:CInt64 = GuardGreaterEq v32, v33 + v35:BasicObject = ArrayAref v28, v34 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v34 + Return v35 "); } @@ -7624,25 +8003,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v14:HashExact = HashDup v13 v19:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Hash@0x1008) PatchPoint MethodRedefined(Hash@0x1008, []@0x1010, cme:0x1018) - v30:BasicObject = HashAref v14, v19 + v31:BasicObject = HashAref v14, v19 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -7656,23 +8036,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :hash, l0, SP@5 v3:BasicObject = GetLocal :key, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :hash@1 + v8:BasicObject = LoadArg :key@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(Hash@0x1000) PatchPoint MethodRedefined(Hash@0x1000, []@0x1008, cme:0x1010) - v27:HashExact = GuardType v11, HashExact - v28:BasicObject = HashAref v27, v12 + v28:HashExact = GuardType v11, HashExact + v29:BasicObject = HashAref v28, v12 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -7687,22 +8070,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :hash, l0, SP@5 v3:BasicObject = GetLocal :key, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :hash@1 + v8:BasicObject = LoadArg :key@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, []@0x1008, cme:0x1010) - v27:HashSubclass[class_exact:C] = GuardType v11, HashSubclass[class_exact:C] - v28:BasicObject = CCallWithFrame v27, :Hash#[]@0x1038, v12 + v28:HashSubclass[class_exact:C] = GuardType v11, HashSubclass[class_exact:C] + v29:BasicObject = CCallWithFrame v28, :Hash#[]@0x1038, v12 CheckInterrupts - Return v28 + Return v29 "); } @@ -7715,24 +8101,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, H) - v23:HashExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v24:HashExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) v13:StaticSymbol[:a] = Const Value(VALUE(0x1010)) PatchPoint NoSingletonClass(Hash@0x1018) PatchPoint MethodRedefined(Hash@0x1018, []@0x1020, cme:0x1028) - v27:BasicObject = HashAref v23, v13 + v28:BasicObject = HashAref v24, v13 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v27 + Return v28 "); } @@ -7746,16 +8133,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:HashExact = NewHash PatchPoint NoEPEscape(test) v22:Fixnum[1] = Const Value(1) @@ -7779,21 +8167,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :hash, l0, SP@6 v3:BasicObject = GetLocal :key, l0, SP@5 v4:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject, v10:BasicObject): - EntryPoint JIT(0) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): + EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :hash@1 + v9:BasicObject = LoadArg :key@2 + v10:BasicObject = LoadArg :val@3 + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): PatchPoint NoSingletonClass(Hash@0x1000) PatchPoint MethodRedefined(Hash@0x1000, []=@0x1008, cme:0x1010) - v35:HashExact = GuardType v13, HashExact - HashAset v35, v14, v15 + v36:HashExact = GuardType v13, HashExact + HashAset v36, v14, v15 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts Return v15 @@ -7811,21 +8203,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :hash, l0, SP@6 v3:BasicObject = GetLocal :key, l0, SP@5 v4:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject, v10:BasicObject): - EntryPoint JIT(0) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): + EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :hash@1 + v9:BasicObject = LoadArg :key@2 + v10:BasicObject = LoadArg :val@3 + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, []=@0x1008, cme:0x1010) - v35:HashSubclass[class_exact:C] = GuardType v13, HashSubclass[class_exact:C] - v36:BasicObject = CCallWithFrame v35, :Hash#[]=@0x1038, v14, v15 + v36:HashSubclass[class_exact:C] = GuardType v13, HashSubclass[class_exact:C] + v37:BasicObject = CCallWithFrame v36, :Hash#[]=@0x1038, v14, v15 CheckInterrupts Return v15 "); @@ -7839,25 +8235,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Thread) - v20:Class[Thread@0x1008] = Const Value(VALUE(0x1008)) + v21:Class[Thread@0x1008] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(Class@0x1010) PatchPoint MethodRedefined(Class@0x1010, current@0x1018, cme:0x1020) - v24:CPtr = LoadEC - v25:CPtr = LoadField v24, :thread_ptr@0x1048 - v26:BasicObject = LoadField v25, :self@0x1049 + v25:CPtr = LoadEC + v26:CPtr = LoadField v25, :thread_ptr@0x1048 + v27:BasicObject = LoadField v26, :self@0x1049 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v26 + Return v27 "); } @@ -7871,31 +8268,33 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v16:Fixnum[1] = Const Value(1) v18:Fixnum[10] = Const Value(10) PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, []=@0x1008, cme:0x1010) - v31:ArrayExact = GuardType v9, ArrayExact - v32:CUInt64 = LoadField v31, :_rbasic_flags@0x1038 - v33:CUInt64 = GuardNoBitsSet v32, RUBY_FL_FREEZE=CUInt64(2048) - v34:CUInt64 = LoadField v31, :_rbasic_flags@0x1038 - v35:CUInt64 = GuardNoBitsSet v34, RUBY_ELTS_SHARED=CUInt64(4096) - v36:CInt64[1] = UnboxFixnum v16 - v37:CInt64 = ArrayLength v31 - v38:CInt64[1] = GuardLess v36, v37 - v39:CInt64[0] = Const CInt64(0) - v40:CInt64[1] = GuardGreaterEq v38, v39 - ArrayAset v31, v40, v18 - WriteBarrier v31, v18 + v32:ArrayExact = GuardType v9, ArrayExact + v33:CUInt64 = LoadField v32, :_rbasic_flags@0x1038 + v34:CUInt64 = GuardNoBitsSet v33, RUBY_FL_FREEZE=CUInt64(2048) + v35:CUInt64 = LoadField v32, :_rbasic_flags@0x1038 + v36:CUInt64 = GuardNoBitsSet v35, RUBY_ELTS_SHARED=CUInt64(4096) + v37:CInt64[1] = UnboxFixnum v16 + v38:CInt64 = ArrayLength v32 + v39:CInt64[1] = GuardLess v37, v38 + v40:CInt64[0] = Const CInt64(0) + v41:CInt64[1] = GuardGreaterEq v39, v40 + ArrayAset v32, v41, v18 + WriteBarrier v32, v18 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts Return v18 @@ -7912,32 +8311,36 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@6 v3:BasicObject = GetLocal :index, l0, SP@5 v4:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject, v10:BasicObject): - EntryPoint JIT(0) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): + EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :arr@1 + v9:BasicObject = LoadArg :index@2 + v10:BasicObject = LoadArg :val@3 + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, []=@0x1008, cme:0x1010) - v35:ArrayExact = GuardType v13, ArrayExact - v36:Fixnum = GuardType v14, Fixnum - v37:CUInt64 = LoadField v35, :_rbasic_flags@0x1038 - v38:CUInt64 = GuardNoBitsSet v37, RUBY_FL_FREEZE=CUInt64(2048) - v39:CUInt64 = LoadField v35, :_rbasic_flags@0x1038 - v40:CUInt64 = GuardNoBitsSet v39, RUBY_ELTS_SHARED=CUInt64(4096) - v41:CInt64 = UnboxFixnum v36 - v42:CInt64 = ArrayLength v35 - v43:CInt64 = GuardLess v41, v42 - v44:CInt64[0] = Const CInt64(0) - v45:CInt64 = GuardGreaterEq v43, v44 - ArrayAset v35, v45, v15 - WriteBarrier v35, v15 + v36:ArrayExact = GuardType v13, ArrayExact + v37:Fixnum = GuardType v14, Fixnum + v38:CUInt64 = LoadField v36, :_rbasic_flags@0x1038 + v39:CUInt64 = GuardNoBitsSet v38, RUBY_FL_FREEZE=CUInt64(2048) + v40:CUInt64 = LoadField v36, :_rbasic_flags@0x1038 + v41:CUInt64 = GuardNoBitsSet v40, RUBY_ELTS_SHARED=CUInt64(4096) + v42:CInt64 = UnboxFixnum v37 + v43:CInt64 = ArrayLength v36 + v44:CInt64 = GuardLess v42, v43 + v45:CInt64[0] = Const CInt64(0) + v46:CInt64 = GuardGreaterEq v44, v45 + ArrayAset v36, v46, v15 + WriteBarrier v36, v15 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts Return v15 @@ -7956,21 +8359,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@6 v3:BasicObject = GetLocal :index, l0, SP@5 v4:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject, v10:BasicObject): - EntryPoint JIT(0) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): + EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :arr@1 + v9:BasicObject = LoadArg :index@2 + v10:BasicObject = LoadArg :val@3 + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): PatchPoint NoSingletonClass(MyArray@0x1000) PatchPoint MethodRedefined(MyArray@0x1000, []=@0x1008, cme:0x1010) - v35:ArraySubclass[class_exact:MyArray] = GuardType v13, ArraySubclass[class_exact:MyArray] - v36:BasicObject = CCallVariadic v35, :Array#[]=@0x1038, v14, v15 + v36:ArraySubclass[class_exact:MyArray] = GuardType v13, ArraySubclass[class_exact:MyArray] + v37:BasicObject = CCallVariadic v36, :Array#[]=@0x1038, v14, v15 CheckInterrupts Return v15 "); @@ -7986,23 +8393,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, <<@0x1008, cme:0x1010) - v25:ArrayExact = GuardType v9, ArrayExact - ArrayPush v25, v14 + v26:ArrayExact = GuardType v9, ArrayExact + ArrayPush v26, v14 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -8016,23 +8425,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, push@0x1008, cme:0x1010) - v24:ArrayExact = GuardType v9, ArrayExact - ArrayPush v24, v14 + v25:ArrayExact = GuardType v9, ArrayExact + ArrayPush v25, v14 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -8046,24 +8457,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) v16:Fixnum[2] = Const Value(2) v18:Fixnum[3] = Const Value(3) PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, push@0x1008, cme:0x1010) - v28:ArrayExact = GuardType v9, ArrayExact - v29:BasicObject = CCallVariadic v28, :Array#push@0x1038, v14, v16, v18 + v29:ArrayExact = GuardType v9, ArrayExact + v30:BasicObject = CCallVariadic v29, :Array#push@0x1038, v14, v16, v18 CheckInterrupts - Return v29 + Return v30 "); } @@ -8076,23 +8489,25 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_length); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, length@0x1008, cme:0x1010) - v23:ArrayExact = GuardType v9, ArrayExact - v24:CInt64 = ArrayLength v23 - v25:Fixnum = BoxFixnum v24 + v24:ArrayExact = GuardType v9, ArrayExact + v25:CInt64 = ArrayLength v24 + v26:Fixnum = BoxFixnum v25 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -8105,23 +8520,25 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_size); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arr, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :arr@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(Array@0x1000) PatchPoint MethodRedefined(Array@0x1000, size@0x1008, cme:0x1010) - v23:ArrayExact = GuardType v9, ArrayExact - v24:CInt64 = ArrayLength v23 - v25:Fixnum = BoxFixnum v24 + v24:ArrayExact = GuardType v9, ArrayExact + v25:CInt64 = ArrayLength v24 + v26:Fixnum = BoxFixnum v25 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -8134,22 +8551,24 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_regexpmatch2); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:RegexpExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) PatchPoint NoSingletonClass(String@0x1008) PatchPoint MethodRedefined(String@0x1008, =~@0x1010, cme:0x1018) - v25:StringExact = GuardType v9, StringExact - v26:BasicObject = CCallWithFrame v25, :String#=~@0x1040, v14 + v26:StringExact = GuardType v9, StringExact + v27:BasicObject = CCallWithFrame v26, :String#=~@0x1040, v14 CheckInterrupts - Return v26 + Return v27 "); } @@ -8161,29 +8580,32 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@5 v3:BasicObject = GetLocal :i, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :s@1 + v8:BasicObject = LoadArg :i@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, getbyte@0x1008, cme:0x1010) - v26:StringExact = GuardType v11, StringExact - v27:Fixnum = GuardType v12, Fixnum - v28:CInt64 = UnboxFixnum v27 - v29:CInt64 = LoadField v26, :len@0x1038 - v30:CInt64 = GuardLess v28, v29 - v31:CInt64[0] = Const CInt64(0) - v32:CInt64 = GuardGreaterEq v30, v31 - v33:Fixnum = StringGetbyte v26, v30 + v27:StringExact = GuardType v11, StringExact + v28:Fixnum = GuardType v12, Fixnum + v29:CInt64 = UnboxFixnum v28 + v30:CInt64 = LoadField v27, :len@0x1038 + v31:CInt64 = GuardLess v29, v30 + v32:CInt64[0] = Const CInt64(0) + v33:CInt64 = GuardGreaterEq v31, v32 + v34:Fixnum = StringGetbyte v27, v31 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v33 + Return v34 "); } @@ -8198,25 +8620,28 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@5 v3:BasicObject = GetLocal :i, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :s@1 + v8:BasicObject = LoadArg :i@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, getbyte@0x1008, cme:0x1010) - v30:StringExact = GuardType v11, StringExact - v31:Fixnum = GuardType v12, Fixnum - v32:CInt64 = UnboxFixnum v31 - v33:CInt64 = LoadField v30, :len@0x1038 - v34:CInt64 = GuardLess v32, v33 - v35:CInt64[0] = Const CInt64(0) - v36:CInt64 = GuardGreaterEq v34, v35 + v31:StringExact = GuardType v11, StringExact + v32:Fixnum = GuardType v12, Fixnum + v33:CInt64 = UnboxFixnum v32 + v34:CInt64 = LoadField v31, :len@0x1038 + v35:CInt64 = GuardLess v33, v34 + v36:CInt64[0] = Const CInt64(0) + v37:CInt64 = GuardGreaterEq v35, v36 IncrCounter inline_cfunc_optimized_send_count v22:Fixnum[5] = Const Value(5) CheckInterrupts @@ -8234,33 +8659,37 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@6 v3:BasicObject = GetLocal :idx, l0, SP@5 v4:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject, v10:BasicObject): - EntryPoint JIT(0) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): + EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :s@1 + v9:BasicObject = LoadArg :idx@2 + v10:BasicObject = LoadArg :val@3 + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, setbyte@0x1008, cme:0x1010) - v30:StringExact = GuardType v13, StringExact - v31:Fixnum = GuardType v14, Fixnum - v32:Fixnum = GuardType v15, Fixnum - v33:CInt64 = UnboxFixnum v31 - v34:CInt64 = LoadField v30, :len@0x1038 - v35:CInt64 = GuardLess v33, v34 - v36:CInt64[0] = Const CInt64(0) - v37:CInt64 = GuardGreaterEq v35, v36 - v38:CUInt64 = LoadField v30, :_rbasic_flags@0x1039 - v39:CUInt64 = GuardNoBitsSet v38, RUBY_FL_FREEZE=CUInt64(2048) - v40:Fixnum = StringSetbyteFixnum v30, v31, v32 + v31:StringExact = GuardType v13, StringExact + v32:Fixnum = GuardType v14, Fixnum + v33:Fixnum = GuardType v15, Fixnum + v34:CInt64 = UnboxFixnum v32 + v35:CInt64 = LoadField v31, :len@0x1038 + v36:CInt64 = GuardLess v34, v35 + v37:CInt64[0] = Const CInt64(0) + v38:CInt64 = GuardGreaterEq v36, v37 + v39:CUInt64 = LoadField v31, :_rbasic_flags@0x1039 + v40:CUInt64 = GuardNoBitsSet v39, RUBY_FL_FREEZE=CUInt64(2048) + v41:Fixnum = StringSetbyteFixnum v31, v32, v33 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v32 + Return v33 "); } @@ -8276,33 +8705,37 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@6 v3:BasicObject = GetLocal :idx, l0, SP@5 v4:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject, v10:BasicObject): - EntryPoint JIT(0) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): + EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :s@1 + v9:BasicObject = LoadArg :idx@2 + v10:BasicObject = LoadArg :val@3 + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): PatchPoint NoSingletonClass(MyString@0x1000) PatchPoint MethodRedefined(MyString@0x1000, setbyte@0x1008, cme:0x1010) - v30:StringSubclass[class_exact:MyString] = GuardType v13, StringSubclass[class_exact:MyString] - v31:Fixnum = GuardType v14, Fixnum - v32:Fixnum = GuardType v15, Fixnum - v33:CInt64 = UnboxFixnum v31 - v34:CInt64 = LoadField v30, :len@0x1038 - v35:CInt64 = GuardLess v33, v34 - v36:CInt64[0] = Const CInt64(0) - v37:CInt64 = GuardGreaterEq v35, v36 - v38:CUInt64 = LoadField v30, :_rbasic_flags@0x1039 - v39:CUInt64 = GuardNoBitsSet v38, RUBY_FL_FREEZE=CUInt64(2048) - v40:Fixnum = StringSetbyteFixnum v30, v31, v32 + v31:StringSubclass[class_exact:MyString] = GuardType v13, StringSubclass[class_exact:MyString] + v32:Fixnum = GuardType v14, Fixnum + v33:Fixnum = GuardType v15, Fixnum + v34:CInt64 = UnboxFixnum v32 + v35:CInt64 = LoadField v31, :len@0x1038 + v36:CInt64 = GuardLess v34, v35 + v37:CInt64[0] = Const CInt64(0) + v38:CInt64 = GuardGreaterEq v36, v37 + v39:CUInt64 = LoadField v31, :_rbasic_flags@0x1039 + v40:CUInt64 = GuardNoBitsSet v39, RUBY_FL_FREEZE=CUInt64(2048) + v41:Fixnum = StringSetbyteFixnum v31, v32, v33 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v32 + Return v33 "); } @@ -8316,23 +8749,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@6 v3:BasicObject = GetLocal :idx, l0, SP@5 v4:BasicObject = GetLocal :val, l0, SP@4 - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject, v10:BasicObject): - EntryPoint JIT(0) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): + EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :s@1 + v9:BasicObject = LoadArg :idx@2 + v10:BasicObject = LoadArg :val@3 + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, setbyte@0x1008, cme:0x1010) - v30:StringExact = GuardType v13, StringExact - v31:BasicObject = CCallWithFrame v30, :String#setbyte@0x1038, v14, v15 + v31:StringExact = GuardType v13, StringExact + v32:BasicObject = CCallWithFrame v31, :String#setbyte@0x1038, v14, v15 CheckInterrupts - Return v31 + Return v32 "); } @@ -8346,25 +8783,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, empty?@0x1008, cme:0x1010) - v23:StringExact = GuardType v9, StringExact - v24:CInt64 = LoadField v23, :len@0x1038 - v25:CInt64[0] = Const CInt64(0) - v26:CBool = IsBitEqual v24, v25 - v27:BoolExact = BoxBool v26 + v24:StringExact = GuardType v9, StringExact + v25:CInt64 = LoadField v24, :len@0x1038 + v26:CInt64[0] = Const CInt64(0) + v27:CBool = IsBitEqual v25, v26 + v28:BoolExact = BoxBool v27 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v27 + Return v28 "); } @@ -8379,18 +8818,20 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, empty?@0x1008, cme:0x1010) - v27:StringExact = GuardType v9, StringExact + v28:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count v19:Fixnum[4] = Const Value(4) CheckInterrupts @@ -8407,22 +8848,24 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_succ); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, succ@0x1008, cme:0x1010) - v22:Fixnum = GuardType v9, Fixnum - v23:Fixnum[1] = Const Value(1) - v24:Fixnum = FixnumAdd v22, v23 + v23:Fixnum = GuardType v9, Fixnum + v24:Fixnum[1] = Const Value(1) + v25:Fixnum = FixnumAdd v23, v24 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -8435,20 +8878,22 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_succ); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, succ@0x1008, cme:0x1010) - v22:Integer = GuardType v9, Integer - v23:BasicObject = CCallWithFrame v22, :Integer#succ@0x1038 + v23:Integer = GuardType v9, Integer + v24:BasicObject = CCallWithFrame v23, :Integer#succ@0x1038 CheckInterrupts - Return v23 + Return v24 "); } @@ -8461,22 +8906,24 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_ltlt); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[5] = Const Value(5) PatchPoint MethodRedefined(Integer@0x1000, <<@0x1008, cme:0x1010) - v24:Fixnum = GuardType v9, Fixnum - v25:Fixnum = FixnumLShift v24, v14 + v25:Fixnum = GuardType v9, Fixnum + v26:Fixnum = FixnumLShift v25, v14 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -8489,21 +8936,23 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_ltlt); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[-5] = Const Value(-5) PatchPoint MethodRedefined(Integer@0x1000, <<@0x1008, cme:0x1010) - v24:Fixnum = GuardType v9, Fixnum - v25:BasicObject = CCallWithFrame v24, :Integer#<<@0x1038, v14 + v25:Fixnum = GuardType v9, Fixnum + v26:BasicObject = CCallWithFrame v25, :Integer#<<@0x1038, v14 CheckInterrupts - Return v25 + Return v26 "); } @@ -8516,21 +8965,23 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_ltlt); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[64] = Const Value(64) PatchPoint MethodRedefined(Integer@0x1000, <<@0x1008, cme:0x1010) - v24:Fixnum = GuardType v9, Fixnum - v25:BasicObject = CCallWithFrame v24, :Integer#<<@0x1038, v14 + v25:Fixnum = GuardType v9, Fixnum + v26:BasicObject = CCallWithFrame v25, :Integer#<<@0x1038, v14 CheckInterrupts - Return v25 + Return v26 "); } @@ -8543,21 +8994,24 @@ mod hir_opt_tests { assert_contains_opcode("test", YARVINSN_opt_ltlt); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, <<@0x1008, cme:0x1010) - v26:Fixnum = GuardType v11, Fixnum - v27:BasicObject = CCallWithFrame v26, :Integer#<<@0x1038, v12 + v27:Fixnum = GuardType v11, Fixnum + v28:BasicObject = CCallWithFrame v27, :Integer#<<@0x1038, v12 CheckInterrupts - Return v27 + Return v28 "); } @@ -8569,22 +9023,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[5] = Const Value(5) PatchPoint MethodRedefined(Integer@0x1000, >>@0x1008, cme:0x1010) - v23:Fixnum = GuardType v9, Fixnum - v24:Fixnum = FixnumRShift v23, v14 + v24:Fixnum = GuardType v9, Fixnum + v25:Fixnum = FixnumRShift v24, v14 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -8596,21 +9052,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[-5] = Const Value(-5) PatchPoint MethodRedefined(Integer@0x1000, >>@0x1008, cme:0x1010) - v23:Fixnum = GuardType v9, Fixnum - v24:BasicObject = CCallWithFrame v23, :Integer#>>@0x1038, v14 + v24:Fixnum = GuardType v9, Fixnum + v25:BasicObject = CCallWithFrame v24, :Integer#>>@0x1038, v14 CheckInterrupts - Return v24 + Return v25 "); } @@ -8622,21 +9080,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[64] = Const Value(64) PatchPoint MethodRedefined(Integer@0x1000, >>@0x1008, cme:0x1010) - v23:Fixnum = GuardType v9, Fixnum - v24:BasicObject = CCallWithFrame v23, :Integer#>>@0x1038, v14 + v24:Fixnum = GuardType v9, Fixnum + v25:BasicObject = CCallWithFrame v24, :Integer#>>@0x1038, v14 CheckInterrupts - Return v24 + Return v25 "); } @@ -8648,21 +9108,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, >>@0x1008, cme:0x1010) - v25:Fixnum = GuardType v11, Fixnum - v26:BasicObject = CCallWithFrame v25, :Integer#>>@0x1038, v12 + v26:Fixnum = GuardType v11, Fixnum + v27:BasicObject = CCallWithFrame v26, :Integer#>>@0x1038, v12 CheckInterrupts - Return v26 + Return v27 "); } @@ -8674,24 +9137,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, <<@0x1008, cme:0x1010) - v27:StringExact = GuardType v11, StringExact - v28:String = GuardType v12, String - v29:StringExact = StringAppend v27, v28 + v28:StringExact = GuardType v11, StringExact + v29:String = GuardType v12, String + v30:StringExact = StringAppend v28, v29 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v27 + Return v28 "); } @@ -8703,24 +9169,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, <<@0x1008, cme:0x1010) - v27:StringExact = GuardType v11, StringExact - v28:Fixnum = GuardType v12, Fixnum - v29:StringExact = StringAppendCodepoint v27, v28 + v28:StringExact = GuardType v11, StringExact + v29:Fixnum = GuardType v12, Fixnum + v30:StringExact = StringAppendCodepoint v28, v29 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v27 + Return v28 "); } @@ -8734,24 +9203,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, <<@0x1008, cme:0x1010) - v27:StringExact = GuardType v11, StringExact - v28:String = GuardType v12, String - v29:StringExact = StringAppend v27, v28 + v28:StringExact = GuardType v11, StringExact + v29:String = GuardType v12, String + v30:StringExact = StringAppend v28, v29 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v27 + Return v28 "); } @@ -8765,22 +9237,25 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(MyString@0x1000) PatchPoint MethodRedefined(MyString@0x1000, <<@0x1008, cme:0x1010) - v27:StringSubclass[class_exact:MyString] = GuardType v11, StringSubclass[class_exact:MyString] - v28:BasicObject = CCallWithFrame v27, :String#<<@0x1038, v12 + v28:StringSubclass[class_exact:MyString] = GuardType v11, StringSubclass[class_exact:MyString] + v29:BasicObject = CCallWithFrame v28, :String#<<@0x1038, v12 CheckInterrupts - Return v28 + Return v29 "); } @@ -8791,22 +9266,23 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:StringExact = StringCopy v10 v13:StaticSymbol[:a] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(String@0x1010) PatchPoint MethodRedefined(String@0x1010, <<@0x1018, cme:0x1020) - v24:BasicObject = CCallWithFrame v11, :String#<<@0x1048, v13 + v25:BasicObject = CCallWithFrame v11, :String#<<@0x1048, v13 CheckInterrupts - Return v24 + Return v25 "); } @@ -8818,14 +9294,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[0] = Const Value(0) v12:Fixnum[3] = Const Value(3) v14:Fixnum[3] = Const Value(3) @@ -8844,22 +9321,24 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, ascii_only?@0x1008, cme:0x1010) - v22:StringExact = GuardType v9, StringExact + v23:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count - v24:BoolExact = CCall v22, :String#ascii_only?@0x1038 + v25:BoolExact = CCall v23, :String#ascii_only?@0x1038 CheckInterrupts - Return v24 + Return v25 "); } @@ -8871,14 +9350,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[0] = Const Value(0) v12:BasicObject = Send v10, :foo # SendFallbackReason: Argument count does not match parameter count CheckInterrupts @@ -8893,14 +9373,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[4] = Const Value(4) v12:Fixnum[1] = Const Value(1) v14:BasicObject = Send v10, :succ, v12 # SendFallbackReason: SendWithoutBlock: unsupported method type Cfunc @@ -8917,23 +9398,26 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, ^@0x1008, cme:0x1010) - v25:Fixnum = GuardType v11, Fixnum - v26:Fixnum = GuardType v12, Fixnum - v27:Fixnum = FixnumXor v25, v26 + v26:Fixnum = GuardType v11, Fixnum + v27:Fixnum = GuardType v12, Fixnum + v28:Fixnum = FixnumXor v26, v27 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v27 + Return v28 "); } @@ -8948,19 +9432,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, ^@0x1008, cme:0x1010) - v29:Fixnum = GuardType v11, Fixnum - v30:Fixnum = GuardType v12, Fixnum + v30:Fixnum = GuardType v11, Fixnum + v31:Fixnum = GuardType v12, Fixnum IncrCounter inline_cfunc_optimized_send_count v22:Fixnum[42] = Const Value(42) CheckInterrupts @@ -8976,21 +9463,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, ^@0x1008, cme:0x1010) - v25:Integer = GuardType v11, Integer - v26:BasicObject = CCallWithFrame v25, :Integer#^@0x1038, v12 + v26:Integer = GuardType v11, Integer + v27:BasicObject = CCallWithFrame v26, :Integer#^@0x1038, v12 CheckInterrupts - Return v26 + Return v27 "); eval(" @@ -8999,21 +9489,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, ^@0x1008, cme:0x1010) - v25:Fixnum = GuardType v11, Fixnum - v26:BasicObject = CCallWithFrame v25, :Integer#^@0x1038, v12 + v26:Fixnum = GuardType v11, Fixnum + v27:BasicObject = CCallWithFrame v26, :Integer#^@0x1038, v12 CheckInterrupts - Return v26 + Return v27 "); eval(" @@ -9022,21 +9515,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint MethodRedefined(TrueClass@0x1000, ^@0x1008, cme:0x1010) - v25:TrueClass = GuardType v11, TrueClass - v26:BasicObject = CCallWithFrame v25, :TrueClass#^@0x1038, v12 + v26:TrueClass = GuardType v11, TrueClass + v27:BasicObject = CCallWithFrame v26, :TrueClass#^@0x1038, v12 CheckInterrupts - Return v26 + Return v27 "); } @@ -9047,16 +9543,19 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v17:BasicObject = Send v11, :^ # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v17 @@ -9071,22 +9570,24 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :hash, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :hash@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(Hash@0x1000) PatchPoint MethodRedefined(Hash@0x1000, size@0x1008, cme:0x1010) - v23:HashExact = GuardType v9, HashExact + v24:HashExact = GuardType v9, HashExact IncrCounter inline_cfunc_optimized_send_count - v25:Fixnum = CCall v23, :Hash#size@0x1038 + v26:Fixnum = CCall v24, :Hash#size@0x1038 CheckInterrupts - Return v25 + Return v26 "); } @@ -9101,18 +9602,20 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :hash, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :hash@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(Hash@0x1000) PatchPoint MethodRedefined(Hash@0x1000, size@0x1008, cme:0x1010) - v27:HashExact = GuardType v9, HashExact + v28:HashExact = GuardType v9, HashExact IncrCounter inline_cfunc_optimized_send_count v19:Fixnum[5] = Const Value(5) CheckInterrupts @@ -9131,25 +9634,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v24:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1040, cme:0x1048) - v28:TrueClass = Const Value(true) + v29:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -9163,26 +9668,28 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v24:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint MethodRedefined(C@0x1008, respond_to_missing?@0x1040, cme:0x1048) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1070, cme:0x1078) - v30:FalseClass = Const Value(false) + v31:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -9198,25 +9705,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v24:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1040, cme:0x1048) - v28:FalseClass = Const Value(false) + v29:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -9232,26 +9741,28 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) v16:FalseClass = Const Value(false) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v26:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v27:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1040, cme:0x1048) - v30:FalseClass = Const Value(false) + v31:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -9267,26 +9778,28 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) v16:NilClass = Const Value(nil) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v26:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v27:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1040, cme:0x1048) - v30:FalseClass = Const Value(false) + v31:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -9302,26 +9815,28 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) v16:TrueClass = Const Value(true) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v26:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v27:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1040, cme:0x1048) - v30:TrueClass = Const Value(true) + v31:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -9336,26 +9851,28 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) v16:Fixnum[4] = Const Value(4) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v26:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v27:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1040, cme:0x1048) - v30:TrueClass = Const Value(true) + v31:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -9370,26 +9887,28 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) v16:NilClass = Const Value(nil) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v26:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v27:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1040, cme:0x1048) - v30:TrueClass = Const Value(true) + v31:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -9403,26 +9922,28 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v24:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v25:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] PatchPoint MethodRedefined(C@0x1008, respond_to_missing?@0x1040, cme:0x1048) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, foo@0x1070, cme:0x1078) - v30:FalseClass = Const Value(false) + v31:FalseClass = Const Value(false) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -9439,22 +9960,24 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:7: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) PatchPoint NoSingletonClass(C@0x1008) PatchPoint MethodRedefined(C@0x1008, respond_to?@0x1010, cme:0x1018) - v24:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] - v25:BasicObject = CCallVariadic v24, :Kernel#respond_to?@0x1040, v14 + v25:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v26:BasicObject = CCallVariadic v25, :Kernel#respond_to?@0x1040, v14 CheckInterrupts - Return v25 + Return v26 "); } @@ -9467,20 +9990,21 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count CheckInterrupts - Return v18 + Return v19 "); } @@ -9494,21 +10018,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:StringExact[VALUE(0x1038)] = Const Value(VALUE(0x1038)) + v22:StringExact[VALUE(0x1038)] = Const Value(VALUE(0x1038)) CheckInterrupts - Return v21 + Return v22 "); } @@ -9521,21 +10046,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:NilClass = Const Value(nil) + v22:NilClass = Const Value(nil) CheckInterrupts - Return v21 + Return v22 "); } @@ -9548,21 +10074,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:TrueClass = Const Value(true) + v22:TrueClass = Const Value(true) CheckInterrupts - Return v21 + Return v22 "); } @@ -9575,21 +10102,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:FalseClass = Const Value(false) + v22:FalseClass = Const Value(false) CheckInterrupts - Return v21 + Return v22 "); } @@ -9602,21 +10130,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:Fixnum[0] = Const Value(0) + v22:Fixnum[0] = Const Value(0) CheckInterrupts - Return v21 + Return v22 "); } @@ -9629,21 +10158,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:Fixnum[1] = Const Value(1) + v22:Fixnum[1] = Const Value(1) CheckInterrupts - Return v21 + Return v22 "); } @@ -9656,18 +10186,19 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[3] = Const Value(3) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v20:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v21:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count CheckInterrupts Return v11 @@ -9683,20 +10214,21 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) v13:Fixnum[2] = Const Value(2) v15:Fixnum[3] = Const Value(3) PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v24:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v25:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count CheckInterrupts Return v15 @@ -9719,16 +10251,17 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:ArrayExact = NewArray v19:ArrayExact = ToArray v13 IncrCounter complex_arg_pass_caller_splat @@ -9756,20 +10289,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Symbol@0x1000, to_sym@0x1008, cme:0x1010) - v20:StaticSymbol = GuardType v9, StaticSymbol + v21:StaticSymbol = GuardType v9, StaticSymbol IncrCounter inline_iseq_optimized_send_count CheckInterrupts - Return v20 + Return v21 "); } @@ -9781,20 +10316,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(Integer@0x1000, to_i@0x1008, cme:0x1010) - v20:Fixnum = GuardType v9, Fixnum + v21:Fixnum = GuardType v9, Fixnum IncrCounter inline_iseq_optimized_send_count CheckInterrupts - Return v20 + Return v21 "); } @@ -9810,21 +10347,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:Fixnum[123] = Const Value(123) + v22:Fixnum[123] = Const Value(123) CheckInterrupts - Return v21 + Return v22 "); } @@ -9840,21 +10378,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:Fixnum[123] = Const Value(123) + v22:Fixnum[123] = Const Value(123) CheckInterrupts - Return v21 + Return v22 "); } @@ -9870,21 +10409,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, callee@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v21:Fixnum[123] = Const Value(123) + v22:Fixnum[123] = Const Value(123) CheckInterrupts - Return v21 + Return v22 "); } @@ -9900,14 +10440,15 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:StaticSymbol[:the_block] = Const Value(VALUE(0x1000)) v13:BasicObject = Send v6, 0x1008, :callee, v11 # SendFallbackReason: Uncategorized(send) CheckInterrupts @@ -9923,24 +10464,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :l, l0, SP@5 v3:BasicObject = GetLocal :r, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :l@1 + v8:BasicObject = LoadArg :r@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, ==@0x1008, cme:0x1010) - v27:StringExact = GuardType v11, StringExact - v28:String = GuardType v12, String - v29:BoolExact = CCall v27, :String#==@0x1038, v28 + v28:StringExact = GuardType v11, StringExact + v29:String = GuardType v12, String + v30:BoolExact = CCall v28, :String#==@0x1038, v29 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v29 + Return v30 "); } @@ -9954,24 +10498,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :l, l0, SP@5 v3:BasicObject = GetLocal :r, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :l@1 + v8:BasicObject = LoadArg :r@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, ==@0x1008, cme:0x1010) - v27:StringSubclass[class_exact:C] = GuardType v11, StringSubclass[class_exact:C] - v28:String = GuardType v12, String - v29:BoolExact = CCall v27, :String#==@0x1038, v28 + v28:StringSubclass[class_exact:C] = GuardType v11, StringSubclass[class_exact:C] + v29:String = GuardType v12, String + v30:BoolExact = CCall v28, :String#==@0x1038, v29 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v29 + Return v30 "); } @@ -9985,24 +10532,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :l, l0, SP@5 v3:BasicObject = GetLocal :r, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :l@1 + v8:BasicObject = LoadArg :r@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, ==@0x1008, cme:0x1010) - v27:StringExact = GuardType v11, StringExact - v28:String = GuardType v12, String - v29:BoolExact = CCall v27, :String#==@0x1038, v28 + v28:StringExact = GuardType v11, StringExact + v29:String = GuardType v12, String + v30:BoolExact = CCall v28, :String#==@0x1038, v29 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v29 + Return v30 "); } @@ -10014,24 +10564,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :l, l0, SP@5 v3:BasicObject = GetLocal :r, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :l@1 + v8:BasicObject = LoadArg :r@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, ===@0x1008, cme:0x1010) - v26:StringExact = GuardType v11, StringExact - v27:String = GuardType v12, String - v28:BoolExact = CCall v26, :String#==@0x1038, v27 + v27:StringExact = GuardType v11, StringExact + v28:String = GuardType v12, String + v29:BoolExact = CCall v27, :String#==@0x1038, v28 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -10045,24 +10598,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :l, l0, SP@5 v3:BasicObject = GetLocal :r, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :l@1 + v8:BasicObject = LoadArg :r@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, ===@0x1008, cme:0x1010) - v26:StringSubclass[class_exact:C] = GuardType v11, StringSubclass[class_exact:C] - v27:String = GuardType v12, String - v28:BoolExact = CCall v26, :String#==@0x1038, v27 + v27:StringSubclass[class_exact:C] = GuardType v11, StringSubclass[class_exact:C] + v28:String = GuardType v12, String + v29:BoolExact = CCall v27, :String#==@0x1038, v28 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -10076,24 +10632,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :l, l0, SP@5 v3:BasicObject = GetLocal :r, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): - EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): + EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :l@1 + v8:BasicObject = LoadArg :r@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, ===@0x1008, cme:0x1010) - v26:StringExact = GuardType v11, StringExact - v27:String = GuardType v12, String - v28:BoolExact = CCall v26, :String#==@0x1038, v27 + v27:StringExact = GuardType v11, StringExact + v28:String = GuardType v12, String + v29:BoolExact = CCall v27, :String#==@0x1038, v28 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v28 + Return v29 "); } @@ -10107,22 +10666,24 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, size@0x1008, cme:0x1010) - v23:StringExact = GuardType v9, StringExact + v24:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count - v25:Fixnum = CCall v23, :String#size@0x1038 + v26:Fixnum = CCall v24, :String#size@0x1038 CheckInterrupts - Return v25 + Return v26 "); } @@ -10137,18 +10698,20 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, size@0x1008, cme:0x1010) - v27:StringExact = GuardType v9, StringExact + v28:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count v19:Fixnum[5] = Const Value(5) CheckInterrupts @@ -10166,23 +10729,25 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, bytesize@0x1008, cme:0x1010) - v22:StringExact = GuardType v9, StringExact - v23:CInt64 = LoadField v22, :len@0x1038 - v24:Fixnum = BoxFixnum v23 + v23:StringExact = GuardType v9, StringExact + v24:CInt64 = LoadField v23, :len@0x1038 + v25:Fixnum = BoxFixnum v24 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v24 + Return v25 "); } @@ -10197,18 +10762,20 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, bytesize@0x1008, cme:0x1010) - v26:StringExact = GuardType v9, StringExact + v27:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count v18:Fixnum[5] = Const Value(5) CheckInterrupts @@ -10226,22 +10793,24 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, length@0x1008, cme:0x1010) - v23:StringExact = GuardType v9, StringExact + v24:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count - v25:Fixnum = CCall v23, :String#length@0x1038 + v26:Fixnum = CCall v24, :String#length@0x1038 CheckInterrupts - Return v25 + Return v26 "); } @@ -10253,25 +10822,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, String) - v26:Class[String@0x1008] = Const Value(VALUE(0x1008)) + v27:Class[String@0x1008] = Const Value(VALUE(0x1008)) PatchPoint NoEPEscape(test) PatchPoint NoSingletonClass(Class@0x1010) PatchPoint MethodRedefined(Class@0x1010, ===@0x1018, cme:0x1020) - v30:BoolExact = IsA v9, v26 + v31:BoolExact = IsA v9, v27 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v30 + Return v31 "); } @@ -10283,25 +10854,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Kernel) - v26:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v27:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoEPEscape(test) PatchPoint NoSingletonClass(Module@0x1010) PatchPoint MethodRedefined(Module@0x1010, ===@0x1018, cme:0x1020) IncrCounter inline_cfunc_optimized_send_count - v31:BoolExact = CCall v26, :Module#===@0x1048, v9 + v32:BoolExact = CCall v27, :Module#===@0x1048, v9 CheckInterrupts - Return v31 + Return v32 "); } @@ -10313,25 +10886,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, String) - v24:Class[String@0x1008] = Const Value(VALUE(0x1008)) + v25:Class[String@0x1008] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(String@0x1008) PatchPoint MethodRedefined(String@0x1008, is_a?@0x1009, cme:0x1010) - v28:StringExact = GuardType v9, StringExact - v29:BoolExact = IsA v28, v24 + v29:StringExact = GuardType v9, StringExact + v30:BoolExact = IsA v29, v25 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v29 + Return v30 "); } @@ -10343,24 +10918,26 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Kernel) - v24:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v25:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(String@0x1010) PatchPoint MethodRedefined(String@0x1010, is_a?@0x1018, cme:0x1020) - v28:StringExact = GuardType v9, StringExact - v29:BasicObject = CCallWithFrame v28, :Kernel#is_a?@0x1048, v24 + v29:StringExact = GuardType v9, StringExact + v30:BasicObject = CCallWithFrame v29, :Kernel#is_a?@0x1048, v25 CheckInterrupts - Return v29 + Return v30 "); } @@ -10375,21 +10952,23 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Integer) - v28:Class[Integer@0x1008] = Const Value(VALUE(0x1008)) + v29:Class[Integer@0x1008] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(String@0x1010) PatchPoint MethodRedefined(String@0x1010, is_a?@0x1018, cme:0x1020) - v32:StringExact = GuardType v9, StringExact + v33:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count v21:Fixnum[5] = Const Value(5) CheckInterrupts @@ -10408,18 +10987,20 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Integer) - v30:Class[Integer@0x1008] = Const Value(VALUE(0x1008)) + v31:Class[Integer@0x1008] = Const Value(VALUE(0x1008)) PatchPoint NoEPEscape(test) PatchPoint NoSingletonClass(Class@0x1010) PatchPoint MethodRedefined(Class@0x1010, ===@0x1018, cme:0x1020) @@ -10438,25 +11019,27 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, String) - v24:Class[String@0x1008] = Const Value(VALUE(0x1008)) + v25:Class[String@0x1008] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(String@0x1008) PatchPoint MethodRedefined(String@0x1008, kind_of?@0x1009, cme:0x1010) - v28:StringExact = GuardType v9, StringExact - v29:BoolExact = IsA v28, v24 + v29:StringExact = GuardType v9, StringExact + v30:BoolExact = IsA v29, v25 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v29 + Return v30 "); } @@ -10468,24 +11051,26 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Kernel) - v24:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v25:ModuleExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(String@0x1010) PatchPoint MethodRedefined(String@0x1010, kind_of?@0x1018, cme:0x1020) - v28:StringExact = GuardType v9, StringExact - v29:BasicObject = CCallWithFrame v28, :Kernel#kind_of?@0x1048, v24 + v29:StringExact = GuardType v9, StringExact + v30:BasicObject = CCallWithFrame v29, :Kernel#kind_of?@0x1048, v25 CheckInterrupts - Return v29 + Return v30 "); } @@ -10500,21 +11085,23 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Integer) - v28:Class[Integer@0x1008] = Const Value(VALUE(0x1008)) + v29:Class[Integer@0x1008] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(String@0x1010) PatchPoint MethodRedefined(String@0x1010, kind_of?@0x1018, cme:0x1020) - v32:StringExact = GuardType v9, StringExact + v33:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count v21:Fixnum[5] = Const Value(5) CheckInterrupts @@ -10531,14 +11118,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[1] = Const Value(1) IncrCounter complex_arg_pass_param_rest IncrCounter complex_arg_pass_param_block @@ -10558,14 +11146,15 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("call_forwardable"), @r" fn call_forwardable@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): IncrCounter complex_arg_pass_param_forwardable v11:BasicObject = Send v6, :forwardable # SendFallbackReason: Complex argument passing CheckInterrupts @@ -10584,18 +11173,20 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(String@0x1000) PatchPoint MethodRedefined(String@0x1000, length@0x1008, cme:0x1010) - v27:StringExact = GuardType v9, StringExact + v28:StringExact = GuardType v9, StringExact IncrCounter inline_cfunc_optimized_send_count v19:Fixnum[4] = Const Value(4) CheckInterrupts @@ -10625,19 +11216,20 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string_proc("TEST"), @r" fn initialize@:9: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, class@0x1008, cme:0x1010) - v42:HeapObject[class_exact:C] = GuardType v6, HeapObject[class_exact:C] + v43:HeapObject[class_exact:C] = GuardType v6, HeapObject[class_exact:C] IncrCounter inline_iseq_optimized_send_count - v46:Class[C@0x1000] = Const Value(VALUE(0x1000)) + v47:Class[C@0x1000] = Const Value(VALUE(0x1000)) IncrCounter inline_cfunc_optimized_send_count v13:StaticSymbol[:_lex_actions] = Const Value(VALUE(0x1038)) v15:TrueClass = Const Value(true) @@ -10645,7 +11237,7 @@ mod hir_opt_tests { PatchPoint MethodRedefined(Class@0x1040, respond_to?@0x1048, cme:0x1050) PatchPoint NoSingletonClass(Class@0x1040) PatchPoint MethodRedefined(Class@0x1040, _lex_actions@0x1078, cme:0x1080) - v54:TrueClass = Const Value(true) + v55:TrueClass = Const Value(true) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts v26:StaticSymbol[:CORRECT] = Const Value(VALUE(0x10a8)) @@ -10663,27 +11255,29 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, class@0x1008, cme:0x1010) - v23:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v24:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] IncrCounter inline_iseq_optimized_send_count - v27:Class[C@0x1000] = Const Value(VALUE(0x1000)) + v28:Class[C@0x1000] = Const Value(VALUE(0x1000)) IncrCounter inline_cfunc_optimized_send_count PatchPoint NoSingletonClass(Class@0x1038) PatchPoint MethodRedefined(Class@0x1038, name@0x1040, cme:0x1048) IncrCounter inline_cfunc_optimized_send_count - v33:StringExact|NilClass = CCall v27, :Module#name@0x1070 + v34:StringExact|NilClass = CCall v28, :Module#name@0x1070 CheckInterrupts - Return v33 + Return v34 "); } @@ -10696,23 +11290,25 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, class@0x1008, cme:0x1010) - v21:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] + v22:HeapObject[class_exact:C] = GuardType v9, HeapObject[class_exact:C] IncrCounter inline_iseq_optimized_send_count - v25:Class[C@0x1000] = Const Value(VALUE(0x1000)) + v26:Class[C@0x1000] = Const Value(VALUE(0x1000)) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -10724,21 +11320,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[5] = Const Value(5) PatchPoint MethodRedefined(Integer@0x1000, class@0x1008, cme:0x1010) IncrCounter inline_iseq_optimized_send_count - v21:Class[Integer@0x1000] = Const Value(VALUE(0x1000)) + v22:Class[Integer@0x1000] = Const Value(VALUE(0x1000)) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v21 + Return v22 "); } @@ -10750,22 +11347,23 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(Object@0x1000) PatchPoint MethodRedefined(Object@0x1000, class@0x1008, cme:0x1010) - v18:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] + v19:HeapObject[class_exact*:Object@VALUE(0x1000)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1000)] IncrCounter inline_iseq_optimized_send_count - v22:Class[Object@0x1038] = Const Value(VALUE(0x1038)) + v23:Class[Object@0x1038] = Const Value(VALUE(0x1038)) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v22 + Return v23 "); } @@ -10790,39 +11388,43 @@ mod hir_opt_tests { assert_eq!(Qtrue, formatted, "{}", formatted.obj_info()); assert_snapshot!(hir_string("read_nil_local"), @r" fn read_nil_local@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :_b, l0, SP@6 v4:BasicObject = GetLocal :_c, l0, SP@5 v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject, v11:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :_b@2 + v11:BasicObject = LoadArg :_c@3 v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:BasicObject, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:BasicObject, v18:NilClass): CheckInterrupts SetLocal :formatted, l0, EP@3, v15 PatchPoint SingleRactorMode - v57:HeapBasicObject = GuardType v14, HeapBasicObject - v58:CShape = LoadField v57, :_shape_id@0x1000 - v59:CShape[0x1001] = GuardBitEquals v58, CShape(0x1001) - StoreField v57, :@formatted@0x1002, v15 - WriteBarrier v57, v15 - v62:CShape[0x1003] = Const CShape(0x1003) - StoreField v57, :_shape_id@0x1000, v62 + v58:HeapBasicObject = GuardType v14, HeapBasicObject + v59:CShape = LoadField v58, :_shape_id@0x1000 + v60:CShape[0x1001] = GuardBitEquals v59, CShape(0x1001) + StoreField v58, :@formatted@0x1002, v15 + WriteBarrier v58, v15 + v63:CShape[0x1003] = Const CShape(0x1003) + StoreField v58, :_shape_id@0x1000, v63 v46:Class[VMFrozenCore] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(Class@0x1010) PatchPoint MethodRedefined(Class@0x1010, lambda@0x1018, cme:0x1020) - v67:BasicObject = CCallWithFrame v46, :RubyVM::FrozenCore.lambda@0x1048, block=0x1050 + v68:BasicObject = CCallWithFrame v46, :RubyVM::FrozenCore.lambda@0x1048, block=0x1050 v49:BasicObject = GetLocal :a, l0, EP@6 v50:BasicObject = GetLocal :_b, l0, EP@5 v51:BasicObject = GetLocal :_c, l0, EP@4 v52:BasicObject = GetLocal :formatted, l0, EP@3 CheckInterrupts - Return v67 + Return v68 "); } @@ -10845,22 +11447,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:11: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, FROZEN_OBJ) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestFrozen@0x1010) PatchPoint MethodRedefined(TestFrozen@0x1010, a@0x1018, cme:0x1020) - v29:Fixnum[1] = Const Value(1) + v30:Fixnum[1] = Const Value(1) CheckInterrupts - Return v29 + Return v30 "); } @@ -10885,22 +11488,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:13: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, MULTI_FROZEN) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestMultiIvars@0x1010) PatchPoint MethodRedefined(TestMultiIvars@0x1010, b@0x1018, cme:0x1020) - v29:Fixnum[20] = Const Value(20) + v30:Fixnum[20] = Const Value(20) CheckInterrupts - Return v29 + Return v30 "); } @@ -10923,22 +11527,23 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:11: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, FROZEN_STR) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestFrozenStr@0x1010) PatchPoint MethodRedefined(TestFrozenStr@0x1010, name@0x1018, cme:0x1020) - v29:StringExact[VALUE(0x1048)] = Const Value(VALUE(0x1048)) + v30:StringExact[VALUE(0x1048)] = Const Value(VALUE(0x1048)) CheckInterrupts - Return v29 + Return v30 "); } @@ -10961,22 +11566,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:11: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, FROZEN_NIL) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestFrozenNil@0x1010) PatchPoint MethodRedefined(TestFrozenNil@0x1010, value@0x1018, cme:0x1020) - v29:NilClass = Const Value(nil) + v30:NilClass = Const Value(nil) CheckInterrupts - Return v29 + Return v30 "); } @@ -10999,24 +11605,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:11: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, UNFROZEN_OBJ) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestUnfrozen@0x1010) PatchPoint MethodRedefined(TestUnfrozen@0x1010, a@0x1018, cme:0x1020) - v25:CShape = LoadField v20, :_shape_id@0x1048 - v26:CShape[0x1049] = GuardBitEquals v25, CShape(0x1049) - v27:BasicObject = LoadField v20, :@a@0x104a + v26:CShape = LoadField v21, :_shape_id@0x1048 + v27:CShape[0x1049] = GuardBitEquals v26, CShape(0x1049) + v28:BasicObject = LoadField v21, :@a@0x104a CheckInterrupts - Return v27 + Return v28 "); } @@ -11039,22 +11646,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:11: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, FROZEN_READER) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestAttrReader@0x1010) PatchPoint MethodRedefined(TestAttrReader@0x1010, value@0x1018, cme:0x1020) - v29:Fixnum[42] = Const Value(42) + v30:Fixnum[42] = Const Value(42) CheckInterrupts - Return v29 + Return v30 "); } @@ -11077,22 +11685,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:11: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, FROZEN_SYM) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestFrozenSym@0x1010) PatchPoint MethodRedefined(TestFrozenSym@0x1010, sym@0x1018, cme:0x1020) - v29:StaticSymbol[:hello] = Const Value(VALUE(0x1048)) + v30:StaticSymbol[:hello] = Const Value(VALUE(0x1048)) CheckInterrupts - Return v29 + Return v30 "); } @@ -11115,22 +11724,23 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:11: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, FROZEN_TRUE) - v20:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestFrozenBool@0x1010) PatchPoint MethodRedefined(TestFrozenBool@0x1010, flag@0x1018, cme:0x1020) - v29:TrueClass = Const Value(true) + v30:TrueClass = Const Value(true) CheckInterrupts - Return v29 + Return v30 "); } @@ -11152,23 +11762,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:9: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :obj, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :obj@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint NoSingletonClass(TestDynamic@0x1000) PatchPoint MethodRedefined(TestDynamic@0x1000, val@0x1008, cme:0x1010) - v21:HeapObject[class_exact:TestDynamic] = GuardType v9, HeapObject[class_exact:TestDynamic] - v24:CShape = LoadField v21, :_shape_id@0x1038 - v25:CShape[0x1039] = GuardBitEquals v24, CShape(0x1039) - v26:BasicObject = LoadField v21, :@val@0x103a + v22:HeapObject[class_exact:TestDynamic] = GuardType v9, HeapObject[class_exact:TestDynamic] + v25:CShape = LoadField v22, :_shape_id@0x1038 + v26:CShape[0x1039] = GuardBitEquals v25, CShape(0x1039) + v27:BasicObject = LoadField v22, :@val@0x103a CheckInterrupts - Return v26 + Return v27 "); } @@ -11192,31 +11804,32 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:12: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, NESTED_FROZEN) - v28:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v29:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestNestedAccess@0x1010) PatchPoint MethodRedefined(TestNestedAccess@0x1010, x@0x1018, cme:0x1020) - v53:Fixnum[100] = Const Value(100) + v54:Fixnum[100] = Const Value(100) PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1048, NESTED_FROZEN) - v34:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v35:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(TestNestedAccess@0x1010) PatchPoint MethodRedefined(TestNestedAccess@0x1010, y@0x1050, cme:0x1058) - v55:Fixnum[200] = Const Value(200) + v56:Fixnum[200] = Const Value(200) PatchPoint MethodRedefined(Integer@0x1080, +@0x1088, cme:0x1090) - v56:Fixnum[300] = Const Value(300) + v57:Fixnum[300] = Const Value(300) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v56 + Return v57 "); } @@ -11229,24 +11842,25 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, S) - v20:StringExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v21:StringExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) PatchPoint NoSingletonClass(String@0x1010) PatchPoint MethodRedefined(String@0x1010, bytesize@0x1018, cme:0x1020) - v24:CInt64 = LoadField v20, :len@0x1048 - v25:Fixnum = BoxFixnum v24 + v25:CInt64 = LoadField v21, :len@0x1048 + v26:Fixnum = BoxFixnum v25 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v25 + Return v26 "); } @@ -11261,21 +11875,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string_proc("C.instance_method(:callprivate)"), @r" fn callprivate@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, secret@0x1008, cme:0x1010) - v18:HeapObject[class_exact:C] = GuardType v6, HeapObject[class_exact:C] + v19:HeapObject[class_exact:C] = GuardType v6, HeapObject[class_exact:C] IncrCounter inline_iseq_optimized_send_count - v21:Fixnum[42] = Const Value(42) + v22:Fixnum[42] = Const Value(42) CheckInterrupts - Return v21 + Return v22 "); } @@ -11291,18 +11906,19 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Obj) - v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) - v13:BasicObject = Send v21, :secret # SendFallbackReason: SendWithoutBlock: method private or protected and no FCALL + v22:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v13:BasicObject = Send v22, :secret # SendFallbackReason: SendWithoutBlock: method private or protected and no FCALL CheckInterrupts Return v13 "); @@ -11318,21 +11934,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string_proc("BasicObject.instance_method(:callprivate)"), @r" fn callprivate@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(BasicObject@0x1000) PatchPoint MethodRedefined(BasicObject@0x1000, initialize@0x1008, cme:0x1010) - v20:BasicObjectExact = GuardType v6, BasicObjectExact - v21:NilClass = Const Value(nil) + v21:BasicObjectExact = GuardType v6, BasicObjectExact + v22:NilClass = Const Value(nil) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v21 + Return v22 "); } @@ -11345,18 +11962,19 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Obj) - v21:BasicObjectExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) - v13:BasicObject = Send v21, :initialize # SendFallbackReason: SendWithoutBlock: method private or protected and no FCALL + v22:BasicObjectExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v13:BasicObject = Send v22, :initialize # SendFallbackReason: SendWithoutBlock: method private or protected and no FCALL CheckInterrupts Return v13 "); @@ -11372,18 +11990,19 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Obj) - v21:ObjectExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) - v13:BasicObject = Send v21, :toplevel_method # SendFallbackReason: SendWithoutBlock: method private or protected and no FCALL + v22:ObjectExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v13:BasicObject = Send v22, :toplevel_method # SendFallbackReason: SendWithoutBlock: method private or protected and no FCALL CheckInterrupts Return v13 "); @@ -11400,21 +12019,22 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string_proc("C.instance_method(:callprotected)"), @r" fn callprotected@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, secret@0x1008, cme:0x1010) - v18:HeapObject[class_exact:C] = GuardType v6, HeapObject[class_exact:C] + v19:HeapObject[class_exact:C] = GuardType v6, HeapObject[class_exact:C] IncrCounter inline_iseq_optimized_send_count - v21:Fixnum[42] = Const Value(42) + v22:Fixnum[42] = Const Value(42) CheckInterrupts - Return v21 + Return v22 "); } @@ -11430,18 +12050,19 @@ mod hir_opt_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1000, Obj) - v21:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) - v13:BasicObject = Send v21, :secret # SendFallbackReason: SendWithoutBlock: method private or protected and no FCALL + v22:HeapObject[VALUE(0x1008)] = Const Value(VALUE(0x1008)) + v13:BasicObject = Send v22, :secret # SendFallbackReason: SendWithoutBlock: method private or protected and no FCALL CheckInterrupts Return v13 "); @@ -11471,15 +12092,17 @@ mod hir_opt_tests { // fall back to SendWithoutBlock instead of the optimized CCall path. assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :s, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :s@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = Send v9, :length # SendFallbackReason: Singleton class previously created for receiver class CheckInterrupts Return v15 @@ -11511,23 +12134,24 @@ mod hir_opt_tests { assert_snapshot!(hir, @r" fn foo@:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint MethodRedefined(A@0x1000, foo@0x1008, cme:0x1010) - v17:CPtr = GetLEP - v18:RubyValue = LoadField v17, :_ep_method_entry@0x1038 - v19:CallableMethodEntry[VALUE(0x1040)] = GuardBitEquals v18, Value(VALUE(0x1040)) - v20:RubyValue = LoadField v17, :_ep_specval@0x1048 - v21:FalseClass = GuardBitEquals v20, Value(false) - v22:BasicObject = SendDirect v6, 0x1050, :foo (0x1060) + v18:CPtr = GetLEP + v19:RubyValue = LoadField v18, :_ep_method_entry@0x1038 + v20:CallableMethodEntry[VALUE(0x1040)] = GuardBitEquals v19, Value(VALUE(0x1040)) + v21:RubyValue = LoadField v18, :_ep_specval@0x1048 + v22:FalseClass = GuardBitEquals v21, Value(false) + v23:BasicObject = SendDirect v6, 0x1050, :foo (0x1060) CheckInterrupts - Return v22 + Return v23 "); } @@ -11538,16 +12162,17 @@ mod hir_opt_tests { itself "); - assert_snapshot!(hir_string("itself"), @" + assert_snapshot!(hir_string("itself"), @r" fn block in @:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = InvokeSuper v6, 0x1000 # SendFallbackReason: super: call from within a block CheckInterrupts Return v11 @@ -11578,29 +12203,31 @@ mod hir_opt_tests { assert_snapshot!(hir, @r" fn foo@:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint MethodRedefined(A@0x1000, foo@0x1008, cme:0x1010) - v26:CPtr = GetLEP - v27:RubyValue = LoadField v26, :_ep_method_entry@0x1038 - v28:CallableMethodEntry[VALUE(0x1040)] = GuardBitEquals v27, Value(VALUE(0x1040)) - v29:RubyValue = LoadField v26, :_ep_specval@0x1048 - v30:FalseClass = GuardBitEquals v29, Value(false) - v31:BasicObject = SendDirect v8, 0x1050, :foo (0x1060), v9 + v27:CPtr = GetLEP + v28:RubyValue = LoadField v27, :_ep_method_entry@0x1038 + v29:CallableMethodEntry[VALUE(0x1040)] = GuardBitEquals v28, Value(VALUE(0x1040)) + v30:RubyValue = LoadField v27, :_ep_specval@0x1048 + v31:FalseClass = GuardBitEquals v30, Value(false) + v32:BasicObject = SendDirect v8, 0x1050, :foo (0x1060), v9 v17:Fixnum[1] = Const Value(1) PatchPoint MethodRedefined(Integer@0x1068, +@0x1070, cme:0x1078) - v34:Fixnum = GuardType v31, Fixnum - v35:Fixnum = FixnumAdd v34, v17 + v35:Fixnum = GuardType v32, Fixnum + v36:Fixnum = FixnumAdd v35, v17 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v35 + Return v36 "); } @@ -11628,15 +12255,17 @@ mod hir_opt_tests { assert_snapshot!(hir, @r" fn foo@:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:ArrayExact = GetLocal :x, l0, SP@4, * - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:ArrayExact): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:ArrayExact): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:ArrayExact = ToArray v9 v17:BasicObject = InvokeSuper v8, 0x1000, v15 # SendFallbackReason: super: complex argument passing to `super` call CheckInterrupts @@ -11669,14 +12298,15 @@ mod hir_opt_tests { // With a block, we don't optimize to SendDirect assert_snapshot!(hir, @r" fn foo@:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = InvokeSuper v6, 0x1000 # SendFallbackReason: super: call made with a block CheckInterrupts Return v11 @@ -11700,24 +12330,25 @@ mod hir_opt_tests { assert_snapshot!(hir, @r" fn size@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint MethodRedefined(Hash@0x1000, size@0x1008, cme:0x1010) - v17:CPtr = GetLEP - v18:RubyValue = LoadField v17, :_ep_method_entry@0x1038 - v19:CallableMethodEntry[VALUE(0x1040)] = GuardBitEquals v18, Value(VALUE(0x1040)) - v20:RubyValue = LoadField v17, :_ep_specval@0x1048 - v21:FalseClass = GuardBitEquals v20, Value(false) + v18:CPtr = GetLEP + v19:RubyValue = LoadField v18, :_ep_method_entry@0x1038 + v20:CallableMethodEntry[VALUE(0x1040)] = GuardBitEquals v19, Value(VALUE(0x1040)) + v21:RubyValue = LoadField v18, :_ep_specval@0x1048 + v22:FalseClass = GuardBitEquals v21, Value(false) IncrCounter inline_cfunc_optimized_send_count - v23:Fixnum = CCall v6, :Hash#size@0x1050 + v24:Fixnum = CCall v6, :Hash#size@0x1050 CheckInterrupts - Return v23 + Return v24 "); } @@ -11734,24 +12365,25 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string_proc("C.instance_method(:initialize)"), @r" fn initialize@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint MethodRedefined(BasicObject@0x1000, initialize@0x1008, cme:0x1010) - v17:CPtr = GetLEP - v18:RubyValue = LoadField v17, :_ep_method_entry@0x1038 - v19:CallableMethodEntry[VALUE(0x1040)] = GuardBitEquals v18, Value(VALUE(0x1040)) - v20:RubyValue = LoadField v17, :_ep_specval@0x1048 - v21:FalseClass = GuardBitEquals v20, Value(false) - v22:NilClass = Const Value(nil) + v18:CPtr = GetLEP + v19:RubyValue = LoadField v18, :_ep_method_entry@0x1038 + v20:CallableMethodEntry[VALUE(0x1040)] = GuardBitEquals v19, Value(VALUE(0x1040)) + v21:RubyValue = LoadField v18, :_ep_specval@0x1048 + v22:FalseClass = GuardBitEquals v21, Value(false) + v23:NilClass = Const Value(nil) IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v22 + Return v23 "); } @@ -11773,7 +12405,7 @@ mod hir_opt_tests { assert_snapshot!(hir, @r" fn byteindex@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :needle, l0, SP@5 @@ -11781,28 +12413,33 @@ mod hir_opt_tests { v4:CPtr = LoadPC v5:CPtr[CPtr(0x1000)] = Const CPtr(0x1008) v6:CBool = IsBitEqual v4, v5 - IfTrue v6, bb2(v1, v2, v3) - Jump bb4(v1, v2, v3) - bb1(v10:BasicObject, v11:BasicObject): + IfTrue v6, bb3(v1, v2, v3) + Jump bb5(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v10:BasicObject = LoadArg :self@0 + v11:BasicObject = LoadArg :needle@1 v12:NilClass = Const Value(nil) - Jump bb2(v10, v11, v12) - bb2(v19:BasicObject, v20:BasicObject, v21:BasicObject): + Jump bb3(v10, v11, v12) + bb3(v19:BasicObject, v20:BasicObject, v21:BasicObject): v24:Fixnum[0] = Const Value(0) - Jump bb4(v19, v20, v24) - bb3(v15:BasicObject, v16:BasicObject, v17:BasicObject): + Jump bb5(v19, v20, v24) + bb4(): EntryPoint JIT(1) - Jump bb4(v15, v16, v17) - bb4(v27:BasicObject, v28:BasicObject, v29:BasicObject): + v15:BasicObject = LoadArg :self@0 + v16:BasicObject = LoadArg :needle@1 + v17:BasicObject = LoadArg :offset@2 + Jump bb5(v15, v16, v17) + bb5(v27:BasicObject, v28:BasicObject, v29:BasicObject): PatchPoint MethodRedefined(String@0x1010, byteindex@0x1018, cme:0x1020) - v42:CPtr = GetLEP - v43:RubyValue = LoadField v42, :_ep_method_entry@0x1048 - v44:CallableMethodEntry[VALUE(0x1050)] = GuardBitEquals v43, Value(VALUE(0x1050)) - v45:RubyValue = LoadField v42, :_ep_specval@0x1058 - v46:FalseClass = GuardBitEquals v45, Value(false) - v47:BasicObject = CCallVariadic v27, :String#byteindex@0x1060, v28, v29 + v43:CPtr = GetLEP + v44:RubyValue = LoadField v43, :_ep_method_entry@0x1048 + v45:CallableMethodEntry[VALUE(0x1050)] = GuardBitEquals v44, Value(VALUE(0x1050)) + v46:RubyValue = LoadField v43, :_ep_specval@0x1058 + v47:FalseClass = GuardBitEquals v46, Value(false) + v48:BasicObject = CCallVariadic v27, :String#byteindex@0x1060, v28, v29 CheckInterrupts - Return v47 + Return v48 "); } @@ -11831,23 +12468,25 @@ mod hir_opt_tests { assert_snapshot!(hir, @r" fn foo@:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :blk, l0, SP@5 v3:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :blk@1 v8:NilClass = Const Value(nil) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:NilClass): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:NilClass): PatchPoint NoSingletonClass(B@0x1000) PatchPoint MethodRedefined(B@0x1000, proc@0x1008, cme:0x1010) - v35:HeapObject[class_exact:B] = GuardType v10, HeapObject[class_exact:B] - v36:BasicObject = CCallWithFrame v35, :Kernel#proc@0x1038, block=0x1040 + v36:HeapObject[class_exact:B] = GuardType v10, HeapObject[class_exact:B] + v37:BasicObject = CCallWithFrame v36, :Kernel#proc@0x1038, block=0x1040 v18:BasicObject = GetLocal :blk, l0, EP@4 - SetLocal :other_block, l0, EP@3, v36 + SetLocal :other_block, l0, EP@3, v37 v25:BasicObject = GetLocal :other_block, l0, EP@3 v27:BasicObject = InvokeSuper v10, 0x1048, v25 # SendFallbackReason: super: complex argument passing to `super` call CheckInterrupts @@ -11879,15 +12518,17 @@ mod hir_opt_tests { assert_snapshot!(hir, @r" fn foo@:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :items, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :items@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:StaticSymbol[:succ] = Const Value(VALUE(0x1000)) v17:BasicObject = InvokeSuper v8, 0x1008, v9, v15 # SendFallbackReason: super: complex argument passing to `super` call CheckInterrupts @@ -11918,27 +12559,30 @@ mod hir_opt_tests { assert_snapshot!(hir, @r" fn foo@:9: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :content, l0, SP@4 v3:CPtr = LoadPC v4:CPtr[CPtr(0x1000)] = Const CPtr(0x1008) v5:CBool = IsBitEqual v3, v4 - IfTrue v5, bb2(v1, v2) - Jump bb4(v1, v2) - bb1(v9:BasicObject): + IfTrue v5, bb3(v1, v2) + Jump bb5(v1, v2) + bb2(): EntryPoint JIT(0) + v9:BasicObject = LoadArg :self@0 v10:NilClass = Const Value(nil) - Jump bb2(v9, v10) - bb2(v16:BasicObject, v17:BasicObject): + Jump bb3(v9, v10) + bb3(v16:BasicObject, v17:BasicObject): v20:StringExact[VALUE(0x1010)] = Const Value(VALUE(0x1010)) v21:StringExact = StringCopy v20 - Jump bb4(v16, v21) - bb3(v13:BasicObject, v14:BasicObject): + Jump bb5(v16, v21) + bb4(): EntryPoint JIT(1) - Jump bb4(v13, v14) - bb4(v24:BasicObject, v25:BasicObject): + v13:BasicObject = LoadArg :self@0 + v14:BasicObject = LoadArg :content@1 + Jump bb5(v13, v14) + bb5(v24:BasicObject, v25:BasicObject): v31:BasicObject = InvokeSuper v24, 0x1018, v25 # SendFallbackReason: super: complex argument passing to `super` call CheckInterrupts Return v31 @@ -11966,19 +12610,21 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): CheckInterrupts v15:CBool = Test v9 v16:Falsy = RefineType v9, Falsy - IfFalse v15, bb5(v8, v16) + IfFalse v15, bb6(v8, v16) v18:Truthy = RefineType v9, Truthy CheckInterrupts v26:Truthy = RefineType v18, Truthy @@ -11987,7 +12633,7 @@ mod hir_opt_tests { v37:Fixnum[3] = Const Value(3) CheckInterrupts Return v37 - bb5(v42:BasicObject, v43:Falsy): + bb6(v42:BasicObject, v43:Falsy): v47:Fixnum[6] = Const Value(6) CheckInterrupts Return v47 @@ -12014,41 +12660,43 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:11: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:CBool = HasType v9, HeapObject[class_exact:C] - IfTrue v14, bb4(v8, v9, v9) + IfTrue v14, bb5(v8, v9, v9) v23:CBool = HasType v9, HeapObject[class_exact:D] - IfTrue v23, bb5(v8, v9, v9) + IfTrue v23, bb6(v8, v9, v9) v32:BasicObject = Send v9, :foo # SendFallbackReason: SendWithoutBlock: polymorphic fallback - Jump bb3(v8, v9, v32) - bb4(v15:BasicObject, v16:BasicObject, v17:BasicObject): + Jump bb4(v8, v9, v32) + bb5(v15:BasicObject, v16:BasicObject, v17:BasicObject): PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, foo@0x1008, cme:0x1010) IncrCounter inline_iseq_optimized_send_count - v54:Fixnum[3] = Const Value(3) - Jump bb3(v15, v16, v54) - bb5(v24:BasicObject, v25:BasicObject, v26:BasicObject): + v55:Fixnum[3] = Const Value(3) + Jump bb4(v15, v16, v55) + bb6(v24:BasicObject, v25:BasicObject, v26:BasicObject): PatchPoint NoSingletonClass(D@0x1038) PatchPoint MethodRedefined(D@0x1038, foo@0x1008, cme:0x1040) IncrCounter inline_iseq_optimized_send_count - v56:Fixnum[4] = Const Value(4) - Jump bb3(v24, v25, v56) - bb3(v34:BasicObject, v35:BasicObject, v36:BasicObject): + v57:Fixnum[4] = Const Value(4) + Jump bb4(v24, v25, v57) + bb4(v34:BasicObject, v35:BasicObject, v36:BasicObject): v39:Fixnum[2] = Const Value(2) PatchPoint MethodRedefined(Integer@0x1068, +@0x1070, cme:0x1078) - v59:Fixnum = GuardType v36, Fixnum - v60:Fixnum = FixnumAdd v59, v39 + v60:Fixnum = GuardType v36, Fixnum + v61:Fixnum = FixnumAdd v60, v39 IncrCounter inline_cfunc_optimized_send_count CheckInterrupts - Return v60 + Return v61 "); } @@ -12066,33 +12714,35 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :o@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:CBool = HasType v9, HeapObject[class_exact:C] - IfTrue v14, bb4(v8, v9, v9) + IfTrue v14, bb5(v8, v9, v9) v23:CBool = HasType v9, Fixnum - IfTrue v23, bb5(v8, v9, v9) + IfTrue v23, bb6(v8, v9, v9) v32:BasicObject = Send v9, :itself # SendFallbackReason: SendWithoutBlock: polymorphic fallback - Jump bb3(v8, v9, v32) - bb4(v15:BasicObject, v16:BasicObject, v17:BasicObject): + Jump bb4(v8, v9, v32) + bb5(v15:BasicObject, v16:BasicObject, v17:BasicObject): v19:HeapObject[class_exact:C] = RefineType v17, HeapObject[class_exact:C] PatchPoint NoSingletonClass(C@0x1000) PatchPoint MethodRedefined(C@0x1000, itself@0x1008, cme:0x1010) IncrCounter inline_cfunc_optimized_send_count - Jump bb3(v15, v16, v19) - bb5(v24:BasicObject, v25:BasicObject, v26:BasicObject): + Jump bb4(v15, v16, v19) + bb6(v24:BasicObject, v25:BasicObject, v26:BasicObject): v28:Fixnum = RefineType v26, Fixnum PatchPoint MethodRedefined(Integer@0x1038, itself@0x1008, cme:0x1010) IncrCounter inline_cfunc_optimized_send_count - Jump bb3(v24, v25, v28) - bb3(v34:BasicObject, v35:BasicObject, v36:BasicObject): + Jump bb4(v24, v25, v28) + bb4(v34:BasicObject, v35:BasicObject, v36:BasicObject): CheckInterrupts Return v36 "); @@ -12111,41 +12761,42 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) PatchPoint SingleRactorMode - v41:HeapBasicObject = GuardType v6, HeapBasicObject - v42:CShape = LoadField v41, :_shape_id@0x1000 - v43:CShape[0x1001] = GuardBitEquals v42, CShape(0x1001) - StoreField v41, :@a@0x1002, v10 - WriteBarrier v41, v10 - v46:CShape[0x1003] = Const CShape(0x1003) - StoreField v41, :_shape_id@0x1000, v46 + v42:HeapBasicObject = GuardType v6, HeapBasicObject + v43:CShape = LoadField v42, :_shape_id@0x1000 + v44:CShape[0x1001] = GuardBitEquals v43, CShape(0x1001) + StoreField v42, :@a@0x1002, v10 + WriteBarrier v42, v10 + v47:CShape[0x1003] = Const CShape(0x1003) + StoreField v42, :_shape_id@0x1000, v47 v14:HeapBasicObject = RefineType v6, HeapBasicObject v17:Fixnum[2] = Const Value(2) PatchPoint SingleRactorMode - v49:CShape = LoadField v14, :_shape_id@0x1000 - v50:CShape[0x1003] = GuardBitEquals v49, CShape(0x1003) + v50:CShape = LoadField v14, :_shape_id@0x1000 + v51:CShape[0x1003] = GuardBitEquals v50, CShape(0x1003) StoreField v14, :@b@0x1004, v17 WriteBarrier v14, v17 - v53:CShape[0x1005] = Const CShape(0x1005) - StoreField v14, :_shape_id@0x1000, v53 + v54:CShape[0x1005] = Const CShape(0x1005) + StoreField v14, :_shape_id@0x1000, v54 v21:HeapBasicObject = RefineType v14, HeapBasicObject v24:Fixnum[3] = Const Value(3) PatchPoint SingleRactorMode - v56:CShape = LoadField v21, :_shape_id@0x1000 - v57:CShape[0x1005] = GuardBitEquals v56, CShape(0x1005) + v57:CShape = LoadField v21, :_shape_id@0x1000 + v58:CShape[0x1005] = GuardBitEquals v57, CShape(0x1005) StoreField v21, :@c@0x1006, v24 WriteBarrier v21, v24 - v60:CShape[0x1007] = Const CShape(0x1007) - StoreField v21, :_shape_id@0x1000, v60 + v61:CShape[0x1007] = Const CShape(0x1007) + StoreField v21, :_shape_id@0x1000, v61 v28:HeapBasicObject = RefineType v21, HeapBasicObject v31:Fixnum[4] = Const Value(4) PatchPoint SingleRactorMode @@ -12179,7 +12830,7 @@ mod hir_opt_tests { "); assert_snapshot!(hir_string("test_ep_escape"), @r" fn test_ep_escape@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :list, l0, SP@7 @@ -12189,54 +12840,63 @@ mod hir_opt_tests { v6:CPtr = LoadPC v7:CPtr[CPtr(0x1000)] = Const CPtr(0x1008) v8:CBool = IsBitEqual v6, v7 - IfTrue v8, bb2(v1, v2, v3, v4, v5) + IfTrue v8, bb3(v1, v2, v3, v4, v5) v10:CPtr[CPtr(0x1000)] = Const CPtr(0x1008) v11:CBool = IsBitEqual v6, v10 - IfTrue v11, bb4(v1, v2, v3, v4, v5) - Jump bb6(v1, v2, v3, v4, v5) - bb1(v15:BasicObject, v16:BasicObject): + IfTrue v11, bb5(v1, v2, v3, v4, v5) + Jump bb7(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v15:BasicObject = LoadArg :self@0 + v16:BasicObject = LoadArg :list@1 v17:NilClass = Const Value(nil) v18:NilClass = Const Value(nil) v19:NilClass = Const Value(nil) - Jump bb2(v15, v16, v17, v18, v19) - bb2(v35:BasicObject, v36:BasicObject, v37:BasicObject, v38:BasicObject, v39:NilClass): + Jump bb3(v15, v16, v17, v18, v19) + bb3(v35:BasicObject, v36:BasicObject, v37:BasicObject, v38:BasicObject, v39:NilClass): v42:NilClass = Const Value(nil) SetLocal :sep, l0, EP@5, v42 - Jump bb4(v35, v36, v42, v38, v39) - bb3(v22:BasicObject, v23:BasicObject, v24:BasicObject): + Jump bb5(v35, v36, v42, v38, v39) + bb4(): EntryPoint JIT(1) + v22:BasicObject = LoadArg :self@0 + v23:BasicObject = LoadArg :list@1 + v24:BasicObject = LoadArg :sep@2 v25:NilClass = Const Value(nil) v26:NilClass = Const Value(nil) - Jump bb4(v22, v23, v24, v25, v26) - bb4(v46:BasicObject, v47:BasicObject, v48:BasicObject, v49:BasicObject, v50:NilClass): + Jump bb5(v22, v23, v24, v25, v26) + bb5(v46:BasicObject, v47:BasicObject, v48:BasicObject, v49:BasicObject, v50:NilClass): v53:StaticSymbol[:each] = Const Value(VALUE(0x1010)) SetLocal :iter_method, l0, EP@4, v53 - Jump bb6(v46, v47, v48, v53, v50) - bb5(v29:BasicObject, v30:BasicObject, v31:BasicObject, v32:BasicObject): + Jump bb7(v46, v47, v48, v53, v50) + bb6(): EntryPoint JIT(2) + v29:BasicObject = LoadArg :self@0 + v30:BasicObject = LoadArg :list@1 + v31:BasicObject = LoadArg :sep@2 + v32:BasicObject = LoadArg :iter_method@3 v33:NilClass = Const Value(nil) - Jump bb6(v29, v30, v31, v32, v33) - bb6(v57:BasicObject, v58:BasicObject, v59:BasicObject, v60:BasicObject, v61:NilClass): + Jump bb7(v29, v30, v31, v32, v33) + bb7(v57:BasicObject, v58:BasicObject, v59:BasicObject, v60:BasicObject, v61:NilClass): CheckInterrupts v67:CBool = Test v59 v68:Truthy = RefineType v59, Truthy - IfTrue v67, bb7(v57, v58, v68, v60, v61) + IfTrue v67, bb8(v57, v58, v68, v60, v61) v70:Falsy = RefineType v59, Falsy PatchPoint NoSingletonClass(Object@0x1018) PatchPoint MethodRedefined(Object@0x1018, lambda@0x1020, cme:0x1028) - v114:HeapObject[class_exact*:Object@VALUE(0x1018)] = GuardType v57, HeapObject[class_exact*:Object@VALUE(0x1018)] - v115:BasicObject = CCallWithFrame v114, :Kernel#lambda@0x1050, block=0x1058 + v115:HeapObject[class_exact*:Object@VALUE(0x1018)] = GuardType v57, HeapObject[class_exact*:Object@VALUE(0x1018)] + v116:BasicObject = CCallWithFrame v115, :Kernel#lambda@0x1050, block=0x1058 v74:BasicObject = GetLocal :list, l0, EP@6 v76:BasicObject = GetLocal :iter_method, l0, EP@4 v77:BasicObject = GetLocal :kwsplat, l0, EP@3 - SetLocal :sep, l0, EP@5, v115 - Jump bb7(v57, v74, v115, v76, v77) - bb7(v81:BasicObject, v82:BasicObject, v83:BasicObject, v84:BasicObject, v85:BasicObject): + SetLocal :sep, l0, EP@5, v116 + Jump bb8(v57, v74, v116, v76, v77) + bb8(v81:BasicObject, v82:BasicObject, v83:BasicObject, v84:BasicObject, v85:BasicObject): PatchPoint SingleRactorMode PatchPoint StableConstantNames(0x1060, CONST) - v110:HashExact[VALUE(0x1068)] = Const Value(VALUE(0x1068)) - SetLocal :kwsplat, l0, EP@3, v110 + v111:HashExact[VALUE(0x1068)] = Const Value(VALUE(0x1068)) + SetLocal :kwsplat, l0, EP@3, v111 v95:BasicObject = GetLocal :list, l0, EP@6 v97:BasicObject = GetLocal :iter_method, l0, EP@4 v99:BasicObject = Send v95, 0x1070, :__send__, v97 # SendFallbackReason: Send: unsupported method type Optimized @@ -12254,47 +12914,48 @@ mod hir_opt_tests { eval("[1, 2, 3].each { |x| x }"); assert_snapshot!(hir_string_proc("Array.instance_method(:each)"), @r" fn each@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:NilClass = Const Value(nil) v15:TrueClass|NilClass = Defined yield, v13 v17:CBool = Test v15 - IfFalse v17, bb3(v8, v9) + IfFalse v17, bb4(v8, v9) v35:Fixnum[0] = Const Value(0) - Jump bb7(v8, v35) - bb3(v23:BasicObject, v24:NilClass): + Jump bb8(v8, v35) + bb4(v23:BasicObject, v24:NilClass): v28:BasicObject = InvokeBuiltin , v23 CheckInterrupts Return v28 - bb7(v48:BasicObject, v49:Fixnum): - v83:Array = RefineType v48, Array - v84:CInt64 = ArrayLength v83 - v85:Fixnum = BoxFixnum v84 - v86:BoolExact = FixnumGe v49, v85 + bb8(v48:BasicObject, v49:Fixnum): + v84:Array = RefineType v48, Array + v85:CInt64 = ArrayLength v84 + v86:Fixnum = BoxFixnum v85 + v87:BoolExact = FixnumGe v49, v86 IncrCounter inline_cfunc_optimized_send_count - v54:CBool = Test v86 - IfFalse v54, bb6(v48, v49) + v54:CBool = Test v87 + IfFalse v54, bb7(v48, v49) CheckInterrupts Return v48 - bb6(v67:BasicObject, v68:Fixnum): - v88:Array = RefineType v67, Array - v89:CInt64 = UnboxFixnum v68 - v90:BasicObject = ArrayAref v88, v89 + bb7(v67:BasicObject, v68:Fixnum): + v89:Array = RefineType v67, Array + v90:CInt64 = UnboxFixnum v68 + v91:BasicObject = ArrayAref v89, v90 IncrCounter inline_cfunc_optimized_send_count - v74:BasicObject = InvokeBlock, v90 # SendFallbackReason: Uncategorized(invokeblock) - v92:Fixnum[1] = Const Value(1) - v93:Fixnum = FixnumAdd v68, v92 + v74:BasicObject = InvokeBlock, v91 # SendFallbackReason: Uncategorized(invokeblock) + v93:Fixnum[1] = Const Value(1) + v94:Fixnum = FixnumAdd v68, v93 IncrCounter inline_cfunc_optimized_send_count PatchPoint NoEPEscape(each) - Jump bb7(v67, v93) + Jump bb8(v67, v94) "); } } diff --git a/zjit/src/hir/tests.rs b/zjit/src/hir/tests.rs index 8b15d7d23fb238..f94057d414bbf7 100644 --- a/zjit/src/hir/tests.rs +++ b/zjit/src/hir/tests.rs @@ -30,15 +30,20 @@ mod snapshot_tests { assert_snapshot!(hir_string("test"), @r" fn test@:1: bb0(): + Entries bb1, bb2 + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v13:Any = Snapshot FrameState { pc: 0x1000, stack: [], locals: [a=v11, b=v12] } v14:Any = Snapshot FrameState { pc: 0x1008, stack: [], locals: [a=v11, b=v12] } PatchPoint NoTracePoint @@ -63,13 +68,16 @@ mod snapshot_tests { assert_snapshot!(optimized_hir_string("test"), @r" fn test@:3: bb0(): + Entries bb1, bb2 + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v8:Any = Snapshot FrameState { pc: 0x1000, stack: [], locals: [] } PatchPoint NoTracePoint v11:Fixnum[3] = Const Value(3) @@ -78,13 +86,13 @@ mod snapshot_tests { v16:Any = Snapshot FrameState { pc: 0x1008, stack: [v6, v11, v13, v15], locals: [] } PatchPoint NoSingletonClass(Object@0x1010) PatchPoint MethodRedefined(Object@0x1010, foo@0x1018, cme:0x1020) - v24:HeapObject[class_exact*:Object@VALUE(0x1010)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1010)] - v25:Any = Snapshot FrameState { pc: 0x1008, stack: [v6, v13, v15, v11], locals: [] } - v26:BasicObject = SendDirect v24, 0x1048, :foo (0x1058), v13, v15, v11 - v18:Any = Snapshot FrameState { pc: 0x1060, stack: [v26], locals: [] } + v25:HeapObject[class_exact*:Object@VALUE(0x1010)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1010)] + v26:Any = Snapshot FrameState { pc: 0x1008, stack: [v6, v13, v15, v11], locals: [] } + v27:BasicObject = SendDirect v25, 0x1048, :foo (0x1058), v13, v15, v11 + v18:Any = Snapshot FrameState { pc: 0x1060, stack: [v27], locals: [] } PatchPoint NoTracePoint CheckInterrupts - Return v26 + Return v27 "); } @@ -99,13 +107,16 @@ mod snapshot_tests { assert_snapshot!(optimized_hir_string("test"), @r" fn test@:3: bb0(): + Entries bb1, bb2 + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v8:Any = Snapshot FrameState { pc: 0x1000, stack: [], locals: [] } PatchPoint NoTracePoint v11:Fixnum[1] = Const Value(1) @@ -113,12 +124,12 @@ mod snapshot_tests { v14:Any = Snapshot FrameState { pc: 0x1008, stack: [v6, v11, v13], locals: [] } PatchPoint NoSingletonClass(Object@0x1010) PatchPoint MethodRedefined(Object@0x1010, foo@0x1018, cme:0x1020) - v22:HeapObject[class_exact*:Object@VALUE(0x1010)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1010)] - v23:BasicObject = SendDirect v22, 0x1048, :foo (0x1058), v11, v13 - v16:Any = Snapshot FrameState { pc: 0x1060, stack: [v23], locals: [] } + v23:HeapObject[class_exact*:Object@VALUE(0x1010)] = GuardType v6, HeapObject[class_exact*:Object@VALUE(0x1010)] + v24:BasicObject = SendDirect v23, 0x1048, :foo (0x1058), v11, v13 + v16:Any = Snapshot FrameState { pc: 0x1060, stack: [v24], locals: [] } PatchPoint NoTracePoint CheckInterrupts - Return v23 + Return v24 "); } @@ -133,13 +144,16 @@ mod snapshot_tests { assert_snapshot!(optimized_hir_string("test"), @r" fn test@:3: bb0(): + Entries bb1, bb2 + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v8:Any = Snapshot FrameState { pc: 0x1000, stack: [], locals: [] } PatchPoint NoTracePoint v11:Fixnum[5] = Const Value(5) @@ -241,26 +255,29 @@ pub mod hir_build_tests { eval("def test(x=1) = 123"); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 v3:CPtr = LoadPC v4:CPtr[CPtr(0x1000)] = Const CPtr(0x1008) v5:CBool = IsBitEqual v3, v4 - IfTrue v5, bb2(v1, v2) - Jump bb4(v1, v2) - bb1(v9:BasicObject): + IfTrue v5, bb3(v1, v2) + Jump bb5(v1, v2) + bb2(): EntryPoint JIT(0) + v9:BasicObject = LoadArg :self@0 v10:NilClass = Const Value(nil) - Jump bb2(v9, v10) - bb2(v16:BasicObject, v17:BasicObject): + Jump bb3(v9, v10) + bb3(v16:BasicObject, v17:BasicObject): v20:Fixnum[1] = Const Value(1) - Jump bb4(v16, v20) - bb3(v13:BasicObject, v14:BasicObject): + Jump bb5(v16, v20) + bb4(): EntryPoint JIT(1) - Jump bb4(v13, v14) - bb4(v23:BasicObject, v24:BasicObject): + v13:BasicObject = LoadArg :self@0 + v14:BasicObject = LoadArg :x@1 + Jump bb5(v13, v14) + bb5(v23:BasicObject, v24:BasicObject): v28:Fixnum[123] = Const Value(123) CheckInterrupts Return v28 @@ -273,14 +290,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_putobject); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[123] = Const Value(123) CheckInterrupts Return v10 @@ -293,14 +311,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newarray); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact = NewArray CheckInterrupts Return v10 @@ -313,15 +332,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newarray); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:ArrayExact = NewArray v9 CheckInterrupts Return v14 @@ -334,16 +355,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newarray); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v18:ArrayExact = NewArray v11, v12 CheckInterrupts Return v18 @@ -356,15 +380,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newrange); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[10] = Const Value(10) v16:RangeExact = NewRange v9 NewRangeInclusive v14 CheckInterrupts @@ -378,16 +404,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newrange); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v18:RangeExact = NewRange v11 NewRangeInclusive v12 CheckInterrupts Return v18 @@ -400,15 +429,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newrange); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[10] = Const Value(10) v16:RangeExact = NewRange v9 NewRangeExclusive v14 CheckInterrupts @@ -422,16 +453,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newrange); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v18:RangeExact = NewRange v11 NewRangeExclusive v12 CheckInterrupts Return v18 @@ -444,14 +478,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_duparray); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:ArrayExact = ArrayDup v10 CheckInterrupts @@ -465,14 +500,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_duphash); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:HashExact = HashDup v10 CheckInterrupts @@ -486,14 +522,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newhash); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:HashExact = NewHash CheckInterrupts Return v10 @@ -506,16 +543,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_newhash); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :aval, l0, SP@5 v3:BasicObject = GetLocal :bval, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :aval@1 + v8:BasicObject = LoadArg :bval@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v16:StaticSymbol[:a] = Const Value(VALUE(0x1000)) v19:StaticSymbol[:b] = Const Value(VALUE(0x1008)) v22:HashExact = NewHash v16: v11, v19: v12 @@ -530,14 +570,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_putchilledstring); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v11:StringExact = StringCopy v10 CheckInterrupts @@ -551,14 +592,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_putobject); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Bignum[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts Return v10 @@ -571,14 +613,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_putobject); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Flonum[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts Return v10 @@ -591,14 +634,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_putobject); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:HeapFloat[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts Return v10 @@ -611,14 +655,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_putobject); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StaticSymbol[:foo] = Const Value(VALUE(0x1000)) CheckInterrupts Return v10 @@ -631,14 +676,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_plus); assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v12:Fixnum[2] = Const Value(2) v15:BasicObject = Send v10, :+, v12 # SendFallbackReason: Uncategorized(opt_plus) @@ -655,14 +701,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_hash_freeze); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE) v11:HashExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts @@ -681,14 +728,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_hash_freeze); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): SideExit PatchPoint(BOPRedefined(HASH_REDEFINED_OP_FLAG, BOP_FREEZE)) "); } @@ -701,14 +749,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_ary_freeze); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE) v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts @@ -727,14 +776,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_ary_freeze); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): SideExit PatchPoint(BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_FREEZE)) "); } @@ -747,14 +797,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_str_freeze); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE) v11:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts @@ -773,14 +824,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_str_freeze); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): SideExit PatchPoint(BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_FREEZE)) "); } @@ -793,14 +845,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_str_uminus); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_UMINUS) v11:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) CheckInterrupts @@ -819,14 +872,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_str_uminus); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): SideExit PatchPoint(BOPRedefined(STRING_REDEFINED_OP_FLAG, BOP_UMINUS)) "); } @@ -842,16 +896,17 @@ pub mod hir_build_tests { assert_contains_opcodes("test", &[YARVINSN_getlocal_WC_0, YARVINSN_setlocal_WC_0]); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:Fixnum[1] = Const Value(1) CheckInterrupts Return v13 @@ -882,14 +937,15 @@ pub mod hir_build_tests { YARVINSN_getlocal, YARVINSN_setlocal]); assert_snapshot!(hir_string("test"), @r" fn block (3 levels) in @:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:BasicObject = GetLocal :l2, l2, EP@4 SetLocal :l1, l1, EP@3, v10 v15:BasicObject = GetLocal :l1, l1, EP@3 @@ -914,7 +970,7 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_setlocal_WC_0); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 @@ -922,21 +978,24 @@ pub mod hir_build_tests { v4:CPtr = LoadPC v5:CPtr[CPtr(0x1000)] = Const CPtr(0x1008) v6:CBool = IsBitEqual v4, v5 - IfTrue v6, bb2(v1, v2, v3) - Jump bb4(v1, v2, v3) - bb1(v10:BasicObject): + IfTrue v6, bb3(v1, v2, v3) + Jump bb5(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v10:BasicObject = LoadArg :self@0 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v10, v11, v12) - bb2(v19:BasicObject, v20:BasicObject, v21:NilClass): + Jump bb3(v10, v11, v12) + bb3(v19:BasicObject, v20:BasicObject, v21:NilClass): v25:Fixnum[1] = Const Value(1) - Jump bb4(v19, v25, v25) - bb3(v15:BasicObject, v16:BasicObject): + Jump bb5(v19, v25, v25) + bb4(): EntryPoint JIT(1) + v15:BasicObject = LoadArg :self@0 + v16:BasicObject = LoadArg :a@1 v17:NilClass = Const Value(nil) - Jump bb4(v15, v16, v17) - bb4(v30:BasicObject, v31:BasicObject, v32:NilClass|Fixnum): + Jump bb5(v15, v16, v17) + bb5(v30:BasicObject, v31:BasicObject, v32:NilClass|Fixnum): v38:ArrayExact = NewArray v31, v32 CheckInterrupts Return v38 @@ -952,7 +1011,7 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 @@ -960,20 +1019,23 @@ pub mod hir_build_tests { v4:CPtr = LoadPC v5:CPtr[CPtr(0x1000)] = Const CPtr(0x1008) v6:CBool = IsBitEqual v4, v5 - IfTrue v6, bb2(v1, v2, v3) - Jump bb4(v1, v2, v3) - bb1(v10:BasicObject): + IfTrue v6, bb3(v1, v2, v3) + Jump bb5(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v10:BasicObject = LoadArg :self@0 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v10, v11, v12) - bb2(v19:BasicObject, v20:BasicObject, v21:NilClass): + Jump bb3(v10, v11, v12) + bb3(v19:BasicObject, v20:BasicObject, v21:NilClass): SideExit UnhandledYARVInsn(trace_putobject_INT2FIX_1_) - bb3(v15:BasicObject, v16:BasicObject): + bb4(): EntryPoint JIT(1) + v15:BasicObject = LoadArg :self@0 + v16:BasicObject = LoadArg :a@1 v17:NilClass = Const Value(nil) - Jump bb4(v15, v16, v17) - bb4(v26:BasicObject, v27:BasicObject, v28:NilClass): + Jump bb5(v15, v16, v17) + bb5(v26:BasicObject, v27:BasicObject, v28:NilClass): v34:ArrayExact = NewArray v27, v28 CheckInterrupts Return v34 @@ -987,25 +1049,28 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 v3:CPtr = LoadPC v4:CPtr[CPtr(0x1000)] = Const CPtr(0x1008) v5:CBool = IsBitEqual v3, v4 - IfTrue v5, bb2(v1, v2) - Jump bb4(v1, v2) - bb1(v9:BasicObject): + IfTrue v5, bb3(v1, v2) + Jump bb5(v1, v2) + bb2(): EntryPoint JIT(0) + v9:BasicObject = LoadArg :self@0 v10:NilClass = Const Value(nil) - Jump bb2(v9, v10) - bb2(v16:BasicObject, v17:BasicObject): + Jump bb3(v9, v10) + bb3(v16:BasicObject, v17:BasicObject): SideExit UnhandledYARVInsn(definemethod) - bb3(v13:BasicObject, v14:BasicObject): + bb4(): EntryPoint JIT(1) - Jump bb4(v13, v14) - bb4(v22:BasicObject, v23:BasicObject): + v13:BasicObject = LoadArg :self@0 + v14:BasicObject = LoadArg :a@1 + Jump bb5(v13, v14) + bb5(v22:BasicObject, v23:BasicObject): CheckInterrupts Return v23 "); @@ -1018,19 +1083,22 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string_proc("test"), @r" fn block in test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb3(v9:BasicObject, v10:BasicObject): + Jump bb3(v5, v6) + bb4(): EntryPoint JIT(1) - Jump bb2(v9, v10) - bb2(v12:BasicObject, v13:BasicObject): + v9:BasicObject = LoadArg :self@0 + v10:BasicObject = LoadArg :a@1 + Jump bb3(v9, v10) + bb3(v12:BasicObject, v13:BasicObject): CheckInterrupts Return v13 "); @@ -1044,14 +1112,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_definedivar); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact|NilClass = DefinedIvar v6, :@foo CheckInterrupts Return v10 @@ -1072,24 +1141,25 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_definedivar); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:TrueClass|NilClass = DefinedIvar v6, :@foo CheckInterrupts v13:CBool = Test v10 v14:NilClass = RefineType v10, Falsy - IfFalse v13, bb3(v6) + IfFalse v13, bb4(v6) v16:TrueClass = RefineType v10, Truthy v19:Fixnum[3] = Const Value(3) CheckInterrupts Return v19 - bb3(v24:BasicObject): + bb4(v24:BasicObject): v28:Fixnum[4] = Const Value(4) CheckInterrupts Return v28 @@ -1104,14 +1174,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_defined); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:NilClass = Const Value(nil) v12:StringExact|NilClass = Defined constant, v10 v15:StringExact|NilClass = Defined func, v6 @@ -1131,14 +1202,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_defined); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:NilClass = Const Value(nil) v12:StringExact|NilClass = Defined yield, v10 CheckInterrupts @@ -1154,14 +1226,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_defined); assert_snapshot!(hir_string("test"), @r" fn block in @:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) CheckInterrupts @@ -1183,24 +1256,26 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_leave); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :cond, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :cond@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): CheckInterrupts v15:CBool = Test v9 v16:Falsy = RefineType v9, Falsy - IfFalse v15, bb3(v8, v16) + IfFalse v15, bb4(v8, v16) v18:Truthy = RefineType v9, Truthy v21:Fixnum[3] = Const Value(3) CheckInterrupts Return v21 - bb3(v26:BasicObject, v27:Falsy): + bb4(v26:BasicObject, v27:Falsy): v31:Fixnum[4] = Const Value(4) CheckInterrupts Return v31 @@ -1221,29 +1296,31 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :cond, l0, SP@5 v3:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :cond@1 v8:NilClass = Const Value(nil) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:NilClass): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:NilClass): CheckInterrupts v18:CBool = Test v11 v19:Falsy = RefineType v11, Falsy - IfFalse v18, bb3(v10, v19, v12) + IfFalse v18, bb4(v10, v19, v12) v21:Truthy = RefineType v11, Truthy v24:Fixnum[3] = Const Value(3) CheckInterrupts - Jump bb4(v10, v21, v24) - bb3(v29:BasicObject, v30:Falsy, v31:NilClass): + Jump bb5(v10, v21, v24) + bb4(v29:BasicObject, v30:Falsy, v31:NilClass): v35:Fixnum[4] = Const Value(4) - Jump bb4(v29, v30, v35) - bb4(v38:BasicObject, v39:BasicObject, v40:Fixnum): + Jump bb5(v29, v30, v35) + bb5(v38:BasicObject, v39:BasicObject, v40:Fixnum): CheckInterrupts Return v40 "); @@ -1258,16 +1335,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_plus); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :+, v12 # SendFallbackReason: Uncategorized(opt_plus) CheckInterrupts Return v19 @@ -1283,16 +1363,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_minus); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :-, v12 # SendFallbackReason: Uncategorized(opt_minus) CheckInterrupts Return v19 @@ -1308,16 +1391,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_mult); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :*, v12 # SendFallbackReason: Uncategorized(opt_mult) CheckInterrupts Return v19 @@ -1333,16 +1419,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_div); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :/, v12 # SendFallbackReason: Uncategorized(opt_div) CheckInterrupts Return v19 @@ -1358,16 +1447,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_mod); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :%, v12 # SendFallbackReason: Uncategorized(opt_mod) CheckInterrupts Return v19 @@ -1383,16 +1475,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_eq); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :==, v12 # SendFallbackReason: Uncategorized(opt_eq) CheckInterrupts Return v19 @@ -1408,16 +1503,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_neq); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :!=, v12 # SendFallbackReason: Uncategorized(opt_neq) CheckInterrupts Return v19 @@ -1433,16 +1531,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_lt); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :<, v12 # SendFallbackReason: Uncategorized(opt_lt) CheckInterrupts Return v19 @@ -1458,16 +1559,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_le); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :<=, v12 # SendFallbackReason: Uncategorized(opt_le) CheckInterrupts Return v19 @@ -1483,16 +1587,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_gt); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :>, v12 # SendFallbackReason: Uncategorized(opt_gt) CheckInterrupts Return v19 @@ -1515,39 +1622,40 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) v3:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 v7:NilClass = Const Value(nil) v8:NilClass = Const Value(nil) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:NilClass, v12:NilClass): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:NilClass, v12:NilClass): v16:Fixnum[0] = Const Value(0) v20:Fixnum[10] = Const Value(10) CheckInterrupts - Jump bb4(v10, v16, v20) - bb4(v26:BasicObject, v27:BasicObject, v28:BasicObject): + Jump bb5(v10, v16, v20) + bb5(v26:BasicObject, v27:BasicObject, v28:BasicObject): v32:Fixnum[0] = Const Value(0) v35:BasicObject = Send v28, :>, v32 # SendFallbackReason: Uncategorized(opt_gt) CheckInterrupts v38:CBool = Test v35 v39:Truthy = RefineType v35, Truthy - IfTrue v38, bb3(v26, v27, v28) + IfTrue v38, bb4(v26, v27, v28) v41:Falsy = RefineType v35, Falsy v43:NilClass = Const Value(nil) CheckInterrupts Return v27 - bb3(v51:BasicObject, v52:BasicObject, v53:BasicObject): + bb4(v51:BasicObject, v52:BasicObject, v53:BasicObject): v58:Fixnum[1] = Const Value(1) v61:BasicObject = Send v52, :+, v58 # SendFallbackReason: Uncategorized(opt_plus) v66:Fixnum[1] = Const Value(1) v69:BasicObject = Send v53, :-, v66 # SendFallbackReason: Uncategorized(opt_minus) - Jump bb4(v51, v61, v69) + Jump bb5(v51, v61, v69) "); } @@ -1560,16 +1668,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_ge); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :>=, v12 # SendFallbackReason: Uncategorized(opt_ge) CheckInterrupts Return v19 @@ -1590,26 +1701,27 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:TrueClass = Const Value(true) CheckInterrupts v19:CBool[true] = Test v13 v20 = RefineType v13, Falsy - IfFalse v19, bb3(v8, v20) + IfFalse v19, bb4(v8, v20) v22:TrueClass = RefineType v13, Truthy v25:Fixnum[3] = Const Value(3) CheckInterrupts Return v25 - bb3(v30, v31): + bb4(v30, v31): v35 = Const Value(4) CheckInterrupts Return v35 @@ -1629,14 +1741,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_send_without_block); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:Fixnum[2] = Const Value(2) v13:Fixnum[3] = Const Value(3) v15:BasicObject = Send v6, :bar, v11, v13 # SendFallbackReason: Uncategorized(opt_send_without_block) @@ -1658,15 +1771,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_send); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:BasicObject = Send v9, 0x1000, :each # SendFallbackReason: Uncategorized(send) v15:BasicObject = GetLocal :a, l0, EP@3 CheckInterrupts @@ -1684,14 +1799,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_intern); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v12:Fixnum[123] = Const Value(123) v15:BasicObject = ObjToString v12 @@ -1710,14 +1826,15 @@ pub mod hir_build_tests { // The 2 string literals have the same address because they're deduped. assert_snapshot!(hir_string("test"), @r" fn test@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:ArrayExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v12:ArrayExact = ArrayDup v11 v14:ArrayExact[VALUE(0x1008)] = Const Value(VALUE(0x1008)) @@ -1739,15 +1856,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:ArrayExact = ToArray v9 v17:BasicObject = Send v8, :foo, v15 # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts @@ -1762,15 +1881,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = Send v8, 0x1000, :foo, v9 # SendFallbackReason: Uncategorized(send) CheckInterrupts Return v15 @@ -1784,15 +1905,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) v16:BasicObject = Send v8, :foo, v14 # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts @@ -1807,15 +1930,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = Send v8, :foo, v9 # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v15 @@ -1831,14 +1956,15 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = InvokeSuper v6, 0x1000 # SendFallbackReason: Uncategorized(invokesuper) CheckInterrupts Return v11 @@ -1852,14 +1978,15 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = InvokeSuper v6, 0x1000 # SendFallbackReason: Uncategorized(invokesuper) CheckInterrupts Return v11 @@ -1873,14 +2000,15 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:NilClass = Const Value(nil) v13:BasicObject = InvokeSuper v6, 0x1000, v11 # SendFallbackReason: Uncategorized(invokesuper) CheckInterrupts @@ -1895,15 +2023,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :..., l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :...@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = InvokeSuperForward v8, 0x1000, v9 # SendFallbackReason: Uncategorized(invokesuperforward) CheckInterrupts Return v15 @@ -1917,15 +2047,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :..., l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :...@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = InvokeSuperForward v8, 0x1000, v9 # SendFallbackReason: Uncategorized(invokesuperforward) v16:BasicObject = GetLocal :..., l0, EP@3 CheckInterrupts @@ -1940,15 +2072,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :..., l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :...@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = InvokeSuperForward v8, 0x1000, v9 # SendFallbackReason: Uncategorized(invokesuperforward) v17:Fixnum[1] = Const Value(1) v20:BasicObject = Send v15, :+, v17 # SendFallbackReason: Uncategorized(opt_plus) @@ -1964,15 +2098,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :..., l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :...@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Fixnum[1] = Const Value(1) v17:BasicObject = InvokeSuperForward v8, 0x1000, v14, v9 # SendFallbackReason: Uncategorized(invokesuperforward) CheckInterrupts @@ -1985,15 +2121,17 @@ pub mod hir_build_tests { eval("def forwardable(...) = nil"); assert_snapshot!(hir_string("forwardable"), @r" fn forwardable@:1: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :..., l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :...@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:NilClass = Const Value(nil) CheckInterrupts Return v13 @@ -2009,15 +2147,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:Class[VMFrozenCore] = Const Value(VALUE(0x1000)) v16:HashExact = NewHash PatchPoint NoEPEscape(test) @@ -2039,15 +2179,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:ArrayExact = GetLocal :*, l0, SP@4, * - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:ArrayExact): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:ArrayExact): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :*@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:ArrayExact = ToNewArray v9 v17:Fixnum[1] = Const Value(1) ArrayPush v15, v17 @@ -2064,15 +2206,17 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :..., l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :...@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = SendForward v8, 0x1000, :foo, v9 # SendFallbackReason: Uncategorized(sendforward) CheckInterrupts Return v15 @@ -2086,7 +2230,7 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@8 @@ -2094,12 +2238,17 @@ pub mod hir_build_tests { v4:BasicObject = GetLocal :**, l0, SP@6 v5:BasicObject = GetLocal :&, l0, SP@5 v6:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5, v6) - bb1(v9:BasicObject, v10:BasicObject, v11:ArrayExact, v12:BasicObject, v13:BasicObject): + Jump bb3(v1, v2, v3, v4, v5, v6) + bb2(): EntryPoint JIT(0) + v9:BasicObject = LoadArg :self@0 + v10:BasicObject = LoadArg :a@1 + v11:BasicObject = LoadArg :*@2 + v12:BasicObject = LoadArg :**@3 + v13:BasicObject = LoadArg :&@4 v14:NilClass = Const Value(nil) - Jump bb2(v9, v10, v11, v12, v13, v14) - bb2(v16:BasicObject, v17:BasicObject, v18:ArrayExact, v19:BasicObject, v20:BasicObject, v21:NilClass): + Jump bb3(v9, v10, v11, v12, v13, v14) + bb3(v16:BasicObject, v17:BasicObject, v18:BasicObject, v19:BasicObject, v20:BasicObject, v21:NilClass): v28:ArrayExact = ToArray v18 PatchPoint NoEPEscape(test) v33:CPtr = GetEP 0 @@ -2121,26 +2270,27 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_new); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v11:BasicObject = GetConstantPath 0x1000 v13:NilClass = Const Value(nil) v16:CBool = IsMethodCFunc v11, :new - IfFalse v16, bb3(v6, v13, v11) + IfFalse v16, bb4(v6, v13, v11) v18:HeapBasicObject = ObjectAlloc v11 v20:BasicObject = Send v18, :initialize # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts - Jump bb4(v6, v18, v20) - bb3(v24:BasicObject, v25:NilClass, v26:BasicObject): + Jump bb5(v6, v18, v20) + bb4(v24:BasicObject, v25:NilClass, v26:BasicObject): v29:BasicObject = Send v26, :new # SendFallbackReason: Uncategorized(opt_send_without_block) - Jump bb4(v24, v29, v25) - bb4(v32:BasicObject, v33:BasicObject, v34:BasicObject): + Jump bb5(v24, v29, v25) + bb5(v32:BasicObject, v33:BasicObject, v34:BasicObject): CheckInterrupts Return v33 "); @@ -2155,14 +2305,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_MAX) v11:BasicObject = ArrayMax CheckInterrupts @@ -2178,16 +2329,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_MAX) v19:BasicObject = ArrayMax v11, v12 CheckInterrupts @@ -2210,16 +2364,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:9: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): SideExit PatchPoint(BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_MAX)) "); } @@ -2237,20 +2394,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :b, l0, SP@6 v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :b@2 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): v25:BasicObject = Send v15, :+, v16 # SendFallbackReason: Uncategorized(opt_plus) SideExit UnhandledNewarraySend(MIN) "); @@ -2269,20 +2429,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :b, l0, SP@6 v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :b@2 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): v25:BasicObject = Send v15, :+, v16 # SendFallbackReason: Uncategorized(opt_plus) PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_HASH) v32:Fixnum = ArrayHash v15, v16 @@ -2311,20 +2474,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:5: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :b, l0, SP@6 v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :b@2 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): v25:BasicObject = Send v15, :+, v16 # SendFallbackReason: Uncategorized(opt_plus) SideExit PatchPoint(BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_HASH)) "); @@ -2343,20 +2509,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :b, l0, SP@6 v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :b@2 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): v25:BasicObject = Send v15, :+, v16 # SendFallbackReason: Uncategorized(opt_plus) v31:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v32:StringExact = StringCopy v31 @@ -2377,20 +2546,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :b, l0, SP@6 v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :b@2 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): v25:BasicObject = Send v15, :+, v16 # SendFallbackReason: Uncategorized(opt_plus) v29:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v30:StringExact = StringCopy v29 @@ -2421,20 +2593,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:6: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :b, l0, SP@6 v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :b@2 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): v25:BasicObject = Send v15, :+, v16 # SendFallbackReason: Uncategorized(opt_plus) v29:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v30:StringExact = StringCopy v29 @@ -2458,20 +2633,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :b, l0, SP@6 v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :b@2 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): v25:BasicObject = Send v15, :+, v16 # SendFallbackReason: Uncategorized(opt_plus) PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_INCLUDE_P) v33:BoolExact = ArrayInclude v15, v16 | v16 @@ -2505,20 +2683,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_newarray_send); assert_snapshot!(hir_string("test"), @r" fn test@:10: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@7 v3:BasicObject = GetLocal :b, l0, SP@6 v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :a@1 + v10:BasicObject = LoadArg :b@2 v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:NilClass, v18:NilClass): v25:BasicObject = Send v15, :+, v16 # SendFallbackReason: Uncategorized(opt_plus) SideExit PatchPoint(BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_INCLUDE_P)) "); @@ -2534,15 +2715,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_duparray_send); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): PatchPoint BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_INCLUDE_P) v15:BoolExact = DupArrayInclude VALUE(0x1000) | v9 CheckInterrupts @@ -2566,15 +2749,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_duparray_send); assert_snapshot!(hir_string("test"), @r" fn test@:9: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): SideExit PatchPoint(BOPRedefined(ARRAY_REDEFINED_OP_FLAG, BOP_INCLUDE_P)) "); } @@ -2587,16 +2772,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_length); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v18:ArrayExact = NewArray v11, v12 v21:BasicObject = Send v18, :length # SendFallbackReason: Uncategorized(opt_length) CheckInterrupts @@ -2612,16 +2800,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_size); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v18:ArrayExact = NewArray v11, v12 v21:BasicObject = Send v18, :size # SendFallbackReason: Uncategorized(opt_size) CheckInterrupts @@ -2639,15 +2830,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_getconstant); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :klass, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :klass@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:FalseClass = Const Value(false) v16:BasicObject = GetConstant v9, :ARGV, v14 CheckInterrupts @@ -2664,14 +2857,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_getinstancevariable); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): PatchPoint SingleRactorMode v11:BasicObject = GetIvar v6, :@foo CheckInterrupts @@ -2688,14 +2882,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_setinstancevariable); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) PatchPoint SingleRactorMode SetIvar v6, :@foo, v10 @@ -2744,14 +2939,15 @@ pub mod hir_build_tests { let function = iseq_to_hir(iseq).unwrap(); assert_snapshot!(hir_string_function(&function), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:BasicObject = GetClassVar :@@foo CheckInterrupts Return v10 @@ -2770,14 +2966,15 @@ pub mod hir_build_tests { let function = iseq_to_hir(iseq).unwrap(); assert_snapshot!(hir_string_function(&function), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[42] = Const Value(42) SetClassVar :@@foo, v10 CheckInterrupts @@ -2794,14 +2991,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_setglobal); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) SetGlobal :$foo, v10 CheckInterrupts @@ -2818,14 +3016,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_getglobal); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:BasicObject = GetGlobal :$foo CheckInterrupts Return v10 @@ -2839,25 +3038,27 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :block, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :block@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:CBool = IsBlockParamModified l0 - IfTrue v13, bb3(v8, v9) - Jump bb4(v8, v9) - bb3(v14:BasicObject, v15:BasicObject): + IfTrue v13, bb4(v8, v9) + Jump bb5(v8, v9) + bb4(v14:BasicObject, v15:BasicObject): v22:BasicObject = GetLocal :block, l0, EP@3 - Jump bb5(v14, v22, v22) - bb4(v17:BasicObject, v18:BasicObject): + Jump bb6(v14, v22, v22) + bb5(v17:BasicObject, v18:BasicObject): v24:BasicObject = GetBlockParam :block, l0, EP@3 - Jump bb5(v17, v24, v24) - bb5(v26:BasicObject, v27:BasicObject, v28:BasicObject): + Jump bb6(v17, v24, v24) + bb6(v26:BasicObject, v27:BasicObject, v28:BasicObject): CheckInterrupts Return v28 "); @@ -2874,24 +3075,25 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string_proc("test"), @r" fn block in test@:4: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:CBool = IsBlockParamModified l1 - IfTrue v10, bb3(v6) - Jump bb4(v6) - bb3(v11:BasicObject): + IfTrue v10, bb4(v6) + Jump bb5(v6) + bb4(v11:BasicObject): v17:BasicObject = GetLocal :block, l1, EP@3 - Jump bb5(v11, v17) - bb4(v13:BasicObject): + Jump bb6(v11, v17) + bb5(v13:BasicObject): v19:BasicObject = GetBlockParam :block, l1, EP@3 - Jump bb5(v13, v19) - bb5(v21:BasicObject, v22:BasicObject): + Jump bb6(v13, v19) + bb6(v21:BasicObject, v22:BasicObject): CheckInterrupts Return v22 "); @@ -2905,15 +3107,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_splatarray); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:ArrayExact = ToNewArray v9 CheckInterrupts Return v14 @@ -2928,15 +3132,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_concattoarray); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:Fixnum[1] = Const Value(1) v15:ArrayExact = NewArray v13 v18:ArrayExact = ToArray v9 @@ -2954,15 +3160,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_pushtoarray); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:ArrayExact = ToNewArray v9 v16:Fixnum[1] = Const Value(1) ArrayPush v14, v16 @@ -2979,15 +3187,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_pushtoarray); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :a@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v14:ArrayExact = ToNewArray v9 v16:Fixnum[1] = Const Value(1) v18:Fixnum[2] = Const Value(2) @@ -3008,16 +3218,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_aset); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v16:NilClass = Const Value(nil) v20:Fixnum[1] = Const Value(1) v24:BasicObject = Send v11, :[]=, v12, v20 # SendFallbackReason: Uncategorized(opt_aset) @@ -3034,16 +3247,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_aref); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :a, l0, SP@5 v3:BasicObject = GetLocal :b, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :a@1 + v8:BasicObject = LoadArg :b@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :[], v12 # SendFallbackReason: Uncategorized(opt_aref) CheckInterrupts Return v19 @@ -3058,15 +3274,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_empty_p); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = Send v9, :empty? # SendFallbackReason: Uncategorized(opt_empty_p) CheckInterrupts Return v15 @@ -3081,15 +3299,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_succ); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = Send v9, :succ # SendFallbackReason: Uncategorized(opt_succ) CheckInterrupts Return v15 @@ -3104,16 +3324,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_and); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :&, v12 # SendFallbackReason: Uncategorized(opt_and) CheckInterrupts Return v19 @@ -3128,16 +3351,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_or); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :|, v12 # SendFallbackReason: Uncategorized(opt_or) CheckInterrupts Return v19 @@ -3152,15 +3378,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_not); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v15:BasicObject = Send v9, :! # SendFallbackReason: Uncategorized(opt_not) CheckInterrupts Return v15 @@ -3175,16 +3403,19 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_opt_regexpmatch2); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :regexp, l0, SP@5 v3:BasicObject = GetLocal :matchee, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :regexp@1 + v8:BasicObject = LoadArg :matchee@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v19:BasicObject = Send v11, :=~, v12 # SendFallbackReason: Uncategorized(opt_regexpmatch2) CheckInterrupts Return v19 @@ -3203,14 +3434,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_putspecialobject); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Class[VMFrozenCore] = Const Value(VALUE(0x1000)) v12:BasicObject = PutSpecialObject CBase v14:StaticSymbol[:aliased] = Const Value(VALUE(0x1008)) @@ -3238,20 +3470,21 @@ pub mod hir_build_tests { assert_contains_opcode("reverse_even", YARVINSN_opt_reverse); assert_snapshot!(hir_strings!("reverse_odd", "reverse_even"), @r" fn reverse_odd@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) v3:NilClass = Const Value(nil) v4:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 v8:NilClass = Const Value(nil) v9:NilClass = Const Value(nil) v10:NilClass = Const Value(nil) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:NilClass, v14:NilClass, v15:NilClass): + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:NilClass, v14:NilClass, v15:NilClass): PatchPoint SingleRactorMode v20:BasicObject = GetIvar v12, :@a PatchPoint SingleRactorMode @@ -3264,22 +3497,23 @@ pub mod hir_build_tests { Return v38 fn reverse_even@:8: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) v3:NilClass = Const Value(nil) v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 v9:NilClass = Const Value(nil) v10:NilClass = Const Value(nil) v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:NilClass, v16:NilClass, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:NilClass, v16:NilClass, v17:NilClass, v18:NilClass): PatchPoint SingleRactorMode v23:BasicObject = GetIvar v14, :@a PatchPoint SingleRactorMode @@ -3303,23 +3537,25 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_branchnil); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): CheckInterrupts v16:CBool = IsNil v9 v17:NilClass = Const Value(nil) - IfTrue v16, bb3(v8, v17, v17) + IfTrue v16, bb4(v8, v17, v17) v19:NotNil = RefineType v9, NotNil v21:BasicObject = Send v19, :itself # SendFallbackReason: Uncategorized(opt_send_without_block) - Jump bb3(v8, v19, v21) - bb3(v23:BasicObject, v24:BasicObject, v25:BasicObject): + Jump bb4(v8, v19, v21) + bb4(v23:BasicObject, v24:BasicObject, v25:BasicObject): CheckInterrupts Return v25 "); @@ -3340,32 +3576,34 @@ pub mod hir_build_tests { // Note that IsNil has as its operand a value that we know statically *cannot* be nil assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): CheckInterrupts v15:CBool = Test v9 v16:Falsy = RefineType v9, Falsy - IfFalse v15, bb3(v8, v16) + IfFalse v15, bb4(v8, v16) v18:Truthy = RefineType v9, Truthy CheckInterrupts v24:CBool[false] = IsNil v18 v25:NilClass = Const Value(nil) - IfTrue v24, bb4(v8, v25, v25) + IfTrue v24, bb5(v8, v25, v25) v27:Truthy = RefineType v18, NotNil v29:BasicObject = Send v27, :itself # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v29 - bb3(v34:BasicObject, v35:Falsy): + bb4(v34:BasicObject, v35:Falsy): v39:Fixnum[4] = Const Value(4) - Jump bb4(v34, v35, v39) - bb4(v41:BasicObject, v42:Falsy, v43:Fixnum[4]): + Jump bb5(v34, v35, v39) + bb5(v41:BasicObject, v42:Falsy, v43:Fixnum[4]): CheckInterrupts Return v43 "); @@ -3392,42 +3630,44 @@ pub mod hir_build_tests { "); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): CheckInterrupts v15:CBool = Test v9 v16:Falsy = RefineType v9, Falsy - IfFalse v15, bb5(v8, v16) + IfFalse v15, bb6(v8, v16) v18:Truthy = RefineType v9, Truthy CheckInterrupts v23:CBool[true] = Test v18 v24 = RefineType v18, Falsy - IfFalse v23, bb4(v8, v24) + IfFalse v23, bb5(v8, v24) v26:Truthy = RefineType v18, Truthy CheckInterrupts v31:CBool[true] = Test v26 v32 = RefineType v26, Falsy - IfFalse v31, bb3(v8, v32) + IfFalse v31, bb4(v8, v32) v34:Truthy = RefineType v26, Truthy v37:Fixnum[3] = Const Value(3) CheckInterrupts Return v37 - bb5(v42:BasicObject, v43:Falsy): + bb6(v42:BasicObject, v43:Falsy): v47:Fixnum[6] = Const Value(6) CheckInterrupts Return v47 - bb4(v52, v53): + bb5(v52, v53): v57 = Const Value(5) CheckInterrupts Return v57 - bb3(v62, v63): + bb4(v62, v63): v67 = Const Value(4) CheckInterrupts Return v67 @@ -3439,21 +3679,24 @@ pub mod hir_build_tests { assert_contains_opcode("Float", YARVINSN_opt_invokebuiltin_delegate_leave); assert_snapshot!(hir_string("Float"), @r" fn Float@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :arg, l0, SP@6 v3:BasicObject = GetLocal :exception, l0, SP@5 v4:BasicObject = GetLocal , l0, SP@4 - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject, v9:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :arg@1 + v9:BasicObject = LoadArg :exception@2 v10:BasicObject = GetLocal , l0, EP@3 - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:BasicObject, v15:BasicObject): v19:Float = InvokeBuiltin rb_f_float, v12, v13, v14 - Jump bb3(v12, v13, v14, v15, v19) - bb3(v21:BasicObject, v22:BasicObject, v23:BasicObject, v24:BasicObject, v25:Float): + Jump bb4(v12, v13, v14, v15, v19) + bb4(v21:BasicObject, v22:BasicObject, v23:BasicObject, v24:BasicObject, v25:Float): CheckInterrupts Return v25 "); @@ -3464,17 +3707,18 @@ pub mod hir_build_tests { assert_contains_opcode("class", YARVINSN_opt_invokebuiltin_delegate_leave); assert_snapshot!(hir_string("class"), @r" fn class@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:HeapObject = InvokeBuiltin leaf , v6 - Jump bb3(v6, v10) - bb3(v12:BasicObject, v13:HeapObject): + Jump bb4(v6, v10) + bb4(v12:BasicObject, v13:HeapObject): CheckInterrupts Return v13 "); @@ -3488,7 +3732,7 @@ pub mod hir_build_tests { let function = iseq_to_hir(iseq).unwrap(); assert_snapshot!(hir_string_function(&function), @r" fn open@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :name, l0, SP@8 @@ -3496,13 +3740,17 @@ pub mod hir_build_tests { v4:BasicObject = GetLocal , l0, SP@6 v5:BasicObject = GetLocal :block, l0, SP@5 v6:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5, v6) - bb1(v9:BasicObject, v10:BasicObject, v11:BasicObject, v13:BasicObject): + Jump bb3(v1, v2, v3, v4, v5, v6) + bb2(): EntryPoint JIT(0) + v9:BasicObject = LoadArg :self@0 + v10:BasicObject = LoadArg :name@1 + v11:BasicObject = LoadArg :encoding@2 v12:BasicObject = GetLocal , l0, EP@5 + v13:BasicObject = LoadArg :block@3 v14:NilClass = Const Value(nil) - Jump bb2(v9, v10, v11, v12, v13, v14) - bb2(v16:BasicObject, v17:BasicObject, v18:BasicObject, v19:BasicObject, v20:BasicObject, v21:NilClass): + Jump bb3(v9, v10, v11, v12, v13, v14) + bb3(v16:BasicObject, v17:BasicObject, v18:BasicObject, v19:BasicObject, v20:BasicObject, v21:NilClass): v25:BasicObject = InvokeBuiltin dir_s_open, v16, v17, v18 PatchPoint NoEPEscape(open) v31:CPtr = GetEP 0 @@ -3514,13 +3762,13 @@ pub mod hir_build_tests { CheckInterrupts v39:CBool[true] = Test v36 v40 = RefineType v36, Falsy - IfFalse v39, bb3(v16, v17, v18, v19, v20, v25) + IfFalse v39, bb4(v16, v17, v18, v19, v20, v25) v42:HeapObject[BlockParamProxy] = RefineType v36, Truthy v46:BasicObject = InvokeBlock, v25 # SendFallbackReason: Uncategorized(invokeblock) v49:BasicObject = InvokeBuiltin dir_s_close, v16, v25 CheckInterrupts Return v46 - bb3(v55, v56, v57, v58, v59, v60): + bb4(v55, v56, v57, v58, v59, v60): CheckInterrupts Return v60 "); @@ -3533,17 +3781,18 @@ pub mod hir_build_tests { let function = iseq_to_hir(iseq).unwrap(); assert_snapshot!(hir_string_function(&function), @r" fn enable@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:BasicObject = InvokeBuiltin gc_enable, v6 - Jump bb3(v6, v10) - bb3(v12:BasicObject, v13:BasicObject): + Jump bb4(v6, v10) + bb4(v12:BasicObject, v13:BasicObject): CheckInterrupts Return v13 "); @@ -3556,19 +3805,23 @@ pub mod hir_build_tests { let function = iseq_to_hir(iseq).unwrap(); assert_snapshot!(hir_string_function(&function), @r" fn start@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :full_mark, l0, SP@7 v3:BasicObject = GetLocal :immediate_mark, l0, SP@6 v4:BasicObject = GetLocal :immediate_sweep, l0, SP@5 v5:BasicObject = GetLocal , l0, SP@4 - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject, v10:BasicObject, v11:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :full_mark@1 + v10:BasicObject = LoadArg :immediate_mark@2 + v11:BasicObject = LoadArg :immediate_sweep@3 v12:BasicObject = GetLocal , l0, EP@3 - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:BasicObject, v18:BasicObject): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:BasicObject, v17:BasicObject, v18:BasicObject): v25:FalseClass = Const Value(false) v27:BasicObject = InvokeBuiltin gc_start_internal, v14, v15, v16, v17, v25 CheckInterrupts @@ -3582,17 +3835,18 @@ pub mod hir_build_tests { let function = iseq_to_hir(iseq).unwrap(); assert_snapshot!(hir_string_function(&function), @r" fn name@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact = InvokeBuiltin leaf , v6 - Jump bb3(v6, v10) - bb3(v12:BasicObject, v13:StringExact): + Jump bb4(v6, v10) + bb4(v12:BasicObject, v13:StringExact): CheckInterrupts Return v13 "); @@ -3604,17 +3858,18 @@ pub mod hir_build_tests { let function = iseq_to_hir(iseq).unwrap(); assert_snapshot!(hir_string_function(&function), @r" fn to_s@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact = InvokeBuiltin leaf , v6 - Jump bb3(v6, v10) - bb3(v12:BasicObject, v13:StringExact): + Jump bb4(v6, v10) + bb4(v12:BasicObject, v13:StringExact): CheckInterrupts Return v13 "); @@ -3628,15 +3883,17 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_dupn); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@4 - Jump bb2(v1, v2) - bb1(v5:BasicObject, v6:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:BasicObject): + v5:BasicObject = LoadArg :self@0 + v6:BasicObject = LoadArg :x@1 + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:BasicObject): v13:NilClass = Const Value(nil) v16:Fixnum[0] = Const Value(0) v18:Fixnum[1] = Const Value(1) @@ -3644,13 +3901,13 @@ pub mod hir_build_tests { CheckInterrupts v25:CBool = Test v21 v26:Truthy = RefineType v21, Truthy - IfTrue v25, bb3(v8, v9, v13, v9, v16, v18, v26) + IfTrue v25, bb4(v8, v9, v13, v9, v16, v18, v26) v28:Falsy = RefineType v21, Falsy v31:Fixnum[2] = Const Value(2) v34:BasicObject = Send v9, :[]=, v16, v18, v31 # SendFallbackReason: Uncategorized(opt_send_without_block) CheckInterrupts Return v31 - bb3(v40:BasicObject, v41:BasicObject, v42:NilClass, v43:BasicObject, v44:Fixnum[0], v45:Fixnum[1], v46:Truthy): + bb4(v40:BasicObject, v41:BasicObject, v42:NilClass, v43:BasicObject, v44:Fixnum[0], v45:Fixnum[1], v46:Truthy): CheckInterrupts Return v46 "); @@ -3664,14 +3921,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_objtostring); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v12:Fixnum[1] = Const Value(1) v15:BasicObject = ObjToString v12 @@ -3690,14 +3948,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_concatstrings); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v13:BasicObject = ObjToString v10 v15:String = AnyToString v10, str: v13 @@ -3721,14 +3980,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_concatstrings); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:StringExact[VALUE(0x1000)] = Const Value(VALUE(0x1000)) v12:NilClass = Const Value(nil) v15:BasicObject = ObjToString v12 @@ -3747,14 +4007,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_toregexp); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v13:BasicObject = ObjToString v10 v15:String = AnyToString v10, str: v13 @@ -3778,14 +4039,15 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_toregexp); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:Fixnum[1] = Const Value(1) v13:BasicObject = ObjToString v10 v15:String = AnyToString v10, str: v13 @@ -3808,26 +4070,28 @@ pub mod hir_build_tests { assert_contains_opcode("throw_break", YARVINSN_throw); assert_snapshot!(hir_strings!("throw_return", "throw_break"), @r" fn block in @:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v12:Fixnum[1] = Const Value(1) Throw TAG_RETURN, v12 fn block in @:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v12:Fixnum[2] = Const Value(2) Throw TAG_BREAK, v12 "); @@ -3842,14 +4106,15 @@ pub mod hir_build_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf - Jump bb2(v1) - bb1(v4:BasicObject): + Jump bb3(v1) + bb2(): EntryPoint JIT(0) - Jump bb2(v4) - bb2(v6:BasicObject): + v4:BasicObject = LoadArg :self@0 + Jump bb3(v4) + bb3(v6:BasicObject): v10:BasicObject = InvokeBlock # SendFallbackReason: Uncategorized(invokeblock) CheckInterrupts Return v10 @@ -3865,16 +4130,19 @@ pub mod hir_build_tests { "#); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :x, l0, SP@5 v3:BasicObject = GetLocal :y, l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :x@1 + v8:BasicObject = LoadArg :y@2 + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v18:BasicObject = InvokeBlock, v11, v12 # SendFallbackReason: Uncategorized(invokeblock) CheckInterrupts Return v18 @@ -3891,19 +4159,21 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_expandarray); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@6 v3:NilClass = Const Value(nil) v4:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :o@1 v9:NilClass = Const Value(nil) v10:NilClass = Const Value(nil) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:NilClass, v15:NilClass): + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:NilClass, v15:NilClass): v21:ArrayExact = GuardType v13, ArrayExact v22:CInt64 = ArrayLength v21 v23:CInt64[2] = Const CInt64(2) @@ -3928,19 +4198,21 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_expandarray); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@6 v3:NilClass = Const Value(nil) v4:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4) - bb1(v7:BasicObject, v8:BasicObject): + Jump bb3(v1, v2, v3, v4) + bb2(): EntryPoint JIT(0) + v7:BasicObject = LoadArg :self@0 + v8:BasicObject = LoadArg :o@1 v9:NilClass = Const Value(nil) v10:NilClass = Const Value(nil) - Jump bb2(v7, v8, v9, v10) - bb2(v12:BasicObject, v13:BasicObject, v14:NilClass, v15:NilClass): + Jump bb3(v7, v8, v9, v10) + bb3(v12:BasicObject, v13:BasicObject, v14:NilClass, v15:NilClass): SideExit UnhandledYARVInsn(expandarray) "); } @@ -3955,21 +4227,23 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_expandarray); assert_snapshot!(hir_string("test"), @r" fn test@:3: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :o, l0, SP@7 v3:NilClass = Const Value(nil) v4:NilClass = Const Value(nil) v5:NilClass = Const Value(nil) - Jump bb2(v1, v2, v3, v4, v5) - bb1(v8:BasicObject, v9:BasicObject): + Jump bb3(v1, v2, v3, v4, v5) + bb2(): EntryPoint JIT(0) + v8:BasicObject = LoadArg :self@0 + v9:BasicObject = LoadArg :o@1 v10:NilClass = Const Value(nil) v11:NilClass = Const Value(nil) v12:NilClass = Const Value(nil) - Jump bb2(v8, v9, v10, v11, v12) - bb2(v14:BasicObject, v15:BasicObject, v16:NilClass, v17:NilClass, v18:NilClass): + Jump bb3(v8, v9, v10, v11, v12) + bb3(v14:BasicObject, v15:BasicObject, v16:NilClass, v17:NilClass, v18:NilClass): SideExit UnhandledYARVInsn(expandarray) "); } @@ -3982,28 +4256,30 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_checkkeyword); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :kw, l0, SP@5 v3:BasicObject = GetLocal , l0, SP@4 - Jump bb2(v1, v2, v3) - bb1(v6:BasicObject, v7:BasicObject): + Jump bb3(v1, v2, v3) + bb2(): EntryPoint JIT(0) + v6:BasicObject = LoadArg :self@0 + v7:BasicObject = LoadArg :kw@1 v8:BasicObject = GetLocal , l0, EP@3 - Jump bb2(v6, v7, v8) - bb2(v10:BasicObject, v11:BasicObject, v12:BasicObject): + Jump bb3(v6, v7, v8) + bb3(v10:BasicObject, v11:BasicObject, v12:BasicObject): v15:BoolExact = FixnumBitCheck v12, 0 CheckInterrupts v18:CBool = Test v15 v19:TrueClass = RefineType v15, Truthy - IfTrue v18, bb3(v10, v11, v12) + IfTrue v18, bb4(v10, v11, v12) v21:FalseClass = RefineType v15, Falsy v23:Fixnum[1] = Const Value(1) v25:Fixnum[1] = Const Value(1) v28:BasicObject = Send v23, :+, v25 # SendFallbackReason: Uncategorized(opt_plus) - Jump bb3(v10, v28, v12) - bb3(v31:BasicObject, v32:BasicObject, v33:BasicObject): + Jump bb4(v10, v28, v12) + bb4(v31:BasicObject, v32:BasicObject, v33:BasicObject): CheckInterrupts Return v32 "); @@ -4023,7 +4299,7 @@ pub mod hir_build_tests { assert_contains_opcode("test", YARVINSN_checkkeyword); assert_snapshot!(hir_string("test"), @r" fn test@:2: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:BasicObject = GetLocal :k1, l0, SP@37 @@ -4060,12 +4336,46 @@ pub mod hir_build_tests { v33:BasicObject = GetLocal :k32, l0, SP@6 v34:BasicObject = GetLocal :k33, l0, SP@5 v35:BasicObject = GetLocal , l0, SP@4 - Jump bb2(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) - bb1(v38:BasicObject, v39:BasicObject, v40:BasicObject, v41:BasicObject, v42:BasicObject, v43:BasicObject, v44:BasicObject, v45:BasicObject, v46:BasicObject, v47:BasicObject, v48:BasicObject, v49:BasicObject, v50:BasicObject, v51:BasicObject, v52:BasicObject, v53:BasicObject, v54:BasicObject, v55:BasicObject, v56:BasicObject, v57:BasicObject, v58:BasicObject, v59:BasicObject, v60:BasicObject, v61:BasicObject, v62:BasicObject, v63:BasicObject, v64:BasicObject, v65:BasicObject, v66:BasicObject, v67:BasicObject, v68:BasicObject, v69:BasicObject, v70:BasicObject, v71:BasicObject): + Jump bb3(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) + bb2(): EntryPoint JIT(0) + v38:BasicObject = LoadArg :self@0 + v39:BasicObject = LoadArg :k1@1 + v40:BasicObject = LoadArg :k2@2 + v41:BasicObject = LoadArg :k3@3 + v42:BasicObject = LoadArg :k4@4 + v43:BasicObject = LoadArg :k5@5 + v44:BasicObject = LoadArg :k6@6 + v45:BasicObject = LoadArg :k7@7 + v46:BasicObject = LoadArg :k8@8 + v47:BasicObject = LoadArg :k9@9 + v48:BasicObject = LoadArg :k10@10 + v49:BasicObject = LoadArg :k11@11 + v50:BasicObject = LoadArg :k12@12 + v51:BasicObject = LoadArg :k13@13 + v52:BasicObject = LoadArg :k14@14 + v53:BasicObject = LoadArg :k15@15 + v54:BasicObject = LoadArg :k16@16 + v55:BasicObject = LoadArg :k17@17 + v56:BasicObject = LoadArg :k18@18 + v57:BasicObject = LoadArg :k19@19 + v58:BasicObject = LoadArg :k20@20 + v59:BasicObject = LoadArg :k21@21 + v60:BasicObject = LoadArg :k22@22 + v61:BasicObject = LoadArg :k23@23 + v62:BasicObject = LoadArg :k24@24 + v63:BasicObject = LoadArg :k25@25 + v64:BasicObject = LoadArg :k26@26 + v65:BasicObject = LoadArg :k27@27 + v66:BasicObject = LoadArg :k28@28 + v67:BasicObject = LoadArg :k29@29 + v68:BasicObject = LoadArg :k30@30 + v69:BasicObject = LoadArg :k31@31 + v70:BasicObject = LoadArg :k32@32 + v71:BasicObject = LoadArg :k33@33 v72:BasicObject = GetLocal , l0, EP@3 - Jump bb2(v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63, v64, v65, v66, v67, v68, v69, v70, v71, v72) - bb2(v74:BasicObject, v75:BasicObject, v76:BasicObject, v77:BasicObject, v78:BasicObject, v79:BasicObject, v80:BasicObject, v81:BasicObject, v82:BasicObject, v83:BasicObject, v84:BasicObject, v85:BasicObject, v86:BasicObject, v87:BasicObject, v88:BasicObject, v89:BasicObject, v90:BasicObject, v91:BasicObject, v92:BasicObject, v93:BasicObject, v94:BasicObject, v95:BasicObject, v96:BasicObject, v97:BasicObject, v98:BasicObject, v99:BasicObject, v100:BasicObject, v101:BasicObject, v102:BasicObject, v103:BasicObject, v104:BasicObject, v105:BasicObject, v106:BasicObject, v107:BasicObject, v108:BasicObject): + Jump bb3(v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63, v64, v65, v66, v67, v68, v69, v70, v71, v72) + bb3(v74:BasicObject, v75:BasicObject, v76:BasicObject, v77:BasicObject, v78:BasicObject, v79:BasicObject, v80:BasicObject, v81:BasicObject, v82:BasicObject, v83:BasicObject, v84:BasicObject, v85:BasicObject, v86:BasicObject, v87:BasicObject, v88:BasicObject, v89:BasicObject, v90:BasicObject, v91:BasicObject, v92:BasicObject, v93:BasicObject, v94:BasicObject, v95:BasicObject, v96:BasicObject, v97:BasicObject, v98:BasicObject, v99:BasicObject, v100:BasicObject, v101:BasicObject, v102:BasicObject, v103:BasicObject, v104:BasicObject, v105:BasicObject, v106:BasicObject, v107:BasicObject, v108:BasicObject): SideExit TooManyKeywordParameters "); } @@ -4074,47 +4384,48 @@ pub mod hir_build_tests { fn test_array_each() { assert_snapshot!(hir_string_proc("Array.instance_method(:each)"), @r" fn each@: - bb0(): + bb1(): EntryPoint interpreter v1:BasicObject = LoadSelf v2:NilClass = Const Value(nil) - Jump bb2(v1, v2) - bb1(v5:BasicObject): + Jump bb3(v1, v2) + bb2(): EntryPoint JIT(0) + v5:BasicObject = LoadArg :self@0 v6:NilClass = Const Value(nil) - Jump bb2(v5, v6) - bb2(v8:BasicObject, v9:NilClass): + Jump bb3(v5, v6) + bb3(v8:BasicObject, v9:NilClass): v13:NilClass = Const Value(nil) v15:TrueClass|NilClass = Defined yield, v13 v17:CBool = Test v15 v18:NilClass = RefineType v15, Falsy - IfFalse v17, bb3(v8, v9) + IfFalse v17, bb4(v8, v9) v20:TrueClass = RefineType v15, Truthy - Jump bb5(v8, v9) - bb3(v23:BasicObject, v24:NilClass): + Jump bb6(v8, v9) + bb4(v23:BasicObject, v24:NilClass): v28:BasicObject = InvokeBuiltin , v23 - Jump bb4(v23, v24, v28) - bb4(v40:BasicObject, v41:NilClass, v42:BasicObject): + Jump bb5(v23, v24, v28) + bb5(v40:BasicObject, v41:NilClass, v42:BasicObject): CheckInterrupts Return v42 - bb5(v30:BasicObject, v31:NilClass): + bb6(v30:BasicObject, v31:NilClass): v35:Fixnum[0] = Const Value(0) - Jump bb7(v30, v35) - bb7(v48:BasicObject, v49:Fixnum): + Jump bb8(v30, v35) + bb8(v48:BasicObject, v49:Fixnum): v52:BoolExact = InvokeBuiltin rb_jit_ary_at_end, v48, v49 v54:CBool = Test v52 v55:FalseClass = RefineType v52, Falsy - IfFalse v54, bb6(v48, v49) + IfFalse v54, bb7(v48, v49) v57:TrueClass = RefineType v52, Truthy v59:NilClass = Const Value(nil) CheckInterrupts Return v48 - bb6(v67:BasicObject, v68:Fixnum): + bb7(v67:BasicObject, v68:Fixnum): v72:BasicObject = InvokeBuiltin rb_jit_ary_at, v67, v68 v74:BasicObject = InvokeBlock, v72 # SendFallbackReason: Uncategorized(invokeblock) v78:Fixnum = InvokeBuiltin rb_jit_fixnum_inc, v67, v68 PatchPoint NoEPEscape(each) - Jump bb7(v67, v78) + Jump bb8(v67, v78) "); } } @@ -4144,6 +4455,7 @@ pub mod hir_build_tests { let retval = function.push_insn(bb3, Insn::Const { val: Const::CBool(true) }); function.push_insn(bb3, Insn::Return { val: retval }); + function.seal_entries(); let cfi = ControlFlowInfo::new(&function); assert!(cfi.is_preceded_by(bb1, bb2)); @@ -4169,6 +4481,7 @@ pub mod hir_build_tests { let retval = function.push_insn(bb3, Insn::Const { val: Const::CBool(true) }); function.push_insn(bb3, Insn::Return { val: retval }); + function.seal_entries(); let cfi = ControlFlowInfo::new(&function); assert!(cfi.is_preceded_by(bb2, bb3)); @@ -4193,6 +4506,7 @@ pub mod hir_build_tests { let retval = function.push_insn(bb1, Insn::Const { val: Const::CBool(true) }); function.push_insn(bb1, Insn::Return { val: retval }); + function.seal_entries(); let cfi = ControlFlowInfo::new(&function); assert_eq!(cfi.predecessors(bb1).collect::>().len(), 1); @@ -4221,6 +4535,7 @@ pub mod hir_build_tests { fn test_linked_list() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let bb0 = function.entry_block; let bb1 = function.new_block(0); let bb2 = function.new_block(0); @@ -4233,31 +4548,33 @@ pub mod hir_build_tests { let retval = function.push_insn(bb3, Insn::Const { val: Const::CBool(true) }); function.push_insn(bb3, Insn::Return { val: retval }); + function.seal_entries(); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - Jump bb1() bb1(): Jump bb2() bb2(): Jump bb3() bb3(): + Jump bb4() + bb4(): v3:Any = Const CBool(true) Return v3 "); let dominators = Dominators::new(&function); assert_dominators_contains_self(&function, &dominators); - assert!(dominators.dominators(bb0).eq([bb0].iter())); - assert!(dominators.dominators(bb1).eq([bb0, bb1].iter())); - assert!(dominators.dominators(bb2).eq([bb0, bb1, bb2].iter())); - assert!(dominators.dominators(bb3).eq([bb0, bb1, bb2, bb3].iter())); + assert_eq!(dominators.dominators(bb0), vec![entries, bb0]); + assert_eq!(dominators.dominators(bb1), vec![entries, bb0, bb1]); + assert_eq!(dominators.dominators(bb2), vec![entries, bb0, bb1, bb2]); + assert_eq!(dominators.dominators(bb3), vec![entries, bb0, bb1, bb2, bb3]); } #[test] fn test_diamond() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let bb0 = function.entry_block; let bb1 = function.new_block(0); let bb2 = function.new_block(0); @@ -4273,33 +4590,35 @@ pub mod hir_build_tests { let retval = function.push_insn(bb3, Insn::Const { val: Const::CBool(true) }); function.push_insn(bb3, Insn::Return { val: retval }); + function.seal_entries(); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - v0:Any = Const Value(false) - IfTrue v0, bb1() - Jump bb2() bb1(): + v0:Any = Const Value(false) + IfTrue v0, bb2() Jump bb3() bb2(): - Jump bb3() + Jump bb4() bb3(): + Jump bb4() + bb4(): v5:Any = Const CBool(true) Return v5 "); let dominators = Dominators::new(&function); assert_dominators_contains_self(&function, &dominators); - assert!(dominators.dominators(bb0).eq([bb0].iter())); - assert!(dominators.dominators(bb1).eq([bb0, bb1].iter())); - assert!(dominators.dominators(bb2).eq([bb0, bb2].iter())); - assert!(dominators.dominators(bb3).eq([bb0, bb3].iter())); + assert_eq!(dominators.dominators(bb0), vec![entries, bb0]); + assert_eq!(dominators.dominators(bb1), vec![entries, bb0, bb1]); + assert_eq!(dominators.dominators(bb2), vec![entries, bb0, bb2]); + assert_eq!(dominators.dominators(bb3), vec![entries, bb0, bb3]); } #[test] fn test_complex_cfg() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let bb0 = function.entry_block; let bb1 = function.new_block(0); let bb2 = function.new_block(0); @@ -4330,47 +4649,49 @@ pub mod hir_build_tests { let retval = function.push_insn(bb7, Insn::Const { val: Const::CBool(true) }); function.push_insn(bb7, Insn::Return { val: retval }); + function.seal_entries(); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - Jump bb1() bb1(): - v1:Any = Const Value(false) - IfTrue v1, bb2() - Jump bb4() + Jump bb2() bb2(): - Jump bb3() + v1:Any = Const Value(false) + IfTrue v1, bb3() + Jump bb5() bb3(): - v5:Any = Const Value(false) - IfTrue v5, bb5() - Jump bb7() + Jump bb4() bb4(): - Jump bb5() + v5:Any = Const Value(false) + IfTrue v5, bb6() + Jump bb8() bb5(): Jump bb6() bb6(): Jump bb7() bb7(): + Jump bb8() + bb8(): v11:Any = Const CBool(true) Return v11 "); let dominators = Dominators::new(&function); assert_dominators_contains_self(&function, &dominators); - assert!(dominators.dominators(bb0).eq([bb0].iter())); - assert!(dominators.dominators(bb1).eq([bb0, bb1].iter())); - assert!(dominators.dominators(bb2).eq([bb0, bb1, bb2].iter())); - assert!(dominators.dominators(bb3).eq([bb0, bb1, bb2, bb3].iter())); - assert!(dominators.dominators(bb4).eq([bb0, bb1, bb4].iter())); - assert!(dominators.dominators(bb5).eq([bb0, bb1, bb5].iter())); - assert!(dominators.dominators(bb6).eq([bb0, bb1, bb5, bb6].iter())); - assert!(dominators.dominators(bb7).eq([bb0, bb1, bb7].iter())); + assert_eq!(dominators.dominators(bb0), vec![entries, bb0]); + assert_eq!(dominators.dominators(bb1), vec![entries, bb0, bb1]); + assert_eq!(dominators.dominators(bb2), vec![entries, bb0, bb1, bb2]); + assert_eq!(dominators.dominators(bb3), vec![entries, bb0, bb1, bb2, bb3]); + assert_eq!(dominators.dominators(bb4), vec![entries, bb0, bb1, bb4]); + assert_eq!(dominators.dominators(bb5), vec![entries, bb0, bb1, bb5]); + assert_eq!(dominators.dominators(bb6), vec![entries, bb0, bb1, bb5, bb6]); + assert_eq!(dominators.dominators(bb7), vec![entries, bb0, bb1, bb7]); } #[test] fn test_back_edges() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let bb0 = function.entry_block; let bb1 = function.new_block(0); let bb2 = function.new_block(0); @@ -4397,43 +4718,45 @@ pub mod hir_build_tests { let retval = function.push_insn(bb3, Insn::Const { val: Const::CBool(true) }); function.push_insn(bb3, Insn::Return { val: retval }); + function.seal_entries(); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - v0:Any = Const Value(false) - IfTrue v0, bb1() - Jump bb4() bb1(): - v3:Any = Const Value(false) - IfTrue v3, bb2() - Jump bb3() - bb2(): - Jump bb3() - bb4(): + v0:Any = Const Value(false) + IfTrue v0, bb2() Jump bb5() - bb5(): - v8:Any = Const Value(false) - IfTrue v8, bb3() + bb2(): + v3:Any = Const Value(false) + IfTrue v3, bb3() Jump bb4() bb3(): + Jump bb4() + bb5(): + Jump bb6() + bb6(): + v8:Any = Const Value(false) + IfTrue v8, bb4() + Jump bb5() + bb4(): v11:Any = Const CBool(true) Return v11 "); let dominators = Dominators::new(&function); assert_dominators_contains_self(&function, &dominators); - assert!(dominators.dominators(bb0).eq([bb0].iter())); - assert!(dominators.dominators(bb1).eq([bb0, bb1].iter())); - assert!(dominators.dominators(bb2).eq([bb0, bb1, bb2].iter())); - assert!(dominators.dominators(bb3).eq([bb0, bb3].iter())); - assert!(dominators.dominators(bb4).eq([bb0, bb4].iter())); - assert!(dominators.dominators(bb5).eq([bb0, bb4, bb5].iter())); + assert_eq!(dominators.dominators(bb0), vec![entries, bb0]); + assert_eq!(dominators.dominators(bb1), vec![entries, bb0, bb1]); + assert_eq!(dominators.dominators(bb2), vec![entries, bb0, bb1, bb2]); + assert_eq!(dominators.dominators(bb3), vec![entries, bb0, bb3]); + assert_eq!(dominators.dominators(bb4), vec![entries, bb0, bb4]); + assert_eq!(dominators.dominators(bb5), vec![entries, bb0, bb4, bb5]); } #[test] fn test_multiple_entry_blocks() { let mut function = Function::new(std::ptr::null()); + let entries = function.entries_block; let bb0 = function.entry_block; let bb1 = function.new_block(0); function.jit_entry_blocks.push(bb1); @@ -4446,13 +4769,14 @@ pub mod hir_build_tests { let retval = function.push_insn(bb2, Insn::Const { val: Const::CBool(true) }); function.push_insn(bb2, Insn::Return { val: retval }); + function.seal_entries(); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - Jump bb2() bb1(): - Jump bb2() + Jump bb3() bb2(): + Jump bb3() + bb3(): v2:Any = Const CBool(true) Return v2 "); @@ -4460,8 +4784,9 @@ pub mod hir_build_tests { let dominators = Dominators::new(&function); assert_dominators_contains_self(&function, &dominators); - assert!(dominators.dominators(bb1).eq([bb1].iter())); - assert!(dominators.dominators(bb2).eq([bb2].iter())); + assert_eq!(dominators.dominators(bb0), vec![entries, bb0]); + assert_eq!(dominators.dominators(bb1), vec![entries, bb1]); + assert_eq!(dominators.dominators(bb2), vec![entries, bb2]); assert!(!dominators.is_dominated_by(bb1, bb2)); } @@ -4502,21 +4827,22 @@ mod loop_info_tests { function.push_insn(bb1, Insn::Jump(edge(bb2))); + function.seal_entries(); let cfi = ControlFlowInfo::new(&function); let dominators = Dominators::new(&function); let loop_info = LoopInfo::new(&cfi, &dominators); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - Jump bb2() + bb1(): + Jump bb3() v1:Any = Const Value(false) - bb2(): - IfTrue v1, bb1() + bb3(): + IfTrue v1, bb2() v3:Any = Const CBool(true) Return v3 - bb1(): - Jump bb2() + bb2(): + Jump bb3() "); assert!(loop_info.is_loop_header(bb2)); @@ -4568,25 +4894,26 @@ mod loop_info_tests { let retval = function.push_insn(bb4, Insn::Const { val: Const::CBool(true) }); let _ = function.push_insn(bb4, Insn::Return { val: retval }); + function.seal_entries(); let cfi = ControlFlowInfo::new(&function); let dominators = Dominators::new(&function); let loop_info = LoopInfo::new(&cfi, &dominators); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - Jump bb1() bb1(): Jump bb2() bb2(): - v2:Any = Const Value(false) - IfTrue v2, bb1() Jump bb3() bb3(): - v5:Any = Const Value(true) - IfTrue v5, bb0() + v2:Any = Const Value(false) + IfTrue v2, bb2() Jump bb4() bb4(): + v5:Any = Const Value(true) + IfTrue v5, bb1() + Jump bb5() + bb5(): v8:Any = Const CBool(true) Return v8 "); @@ -4655,30 +4982,31 @@ mod loop_info_tests { let retval = function.push_insn(bb6, Insn::Const { val: Const::CBool(true) }); let _ = function.push_insn(bb6, Insn::Return { val: retval }); + function.seal_entries(); let cfi = ControlFlowInfo::new(&function); let dominators = Dominators::new(&function); let loop_info = LoopInfo::new(&cfi, &dominators); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - v0:Any = Const Value(false) - IfTrue v0, bb1() - Jump bb3() bb1(): - Jump bb2() + v0:Any = Const Value(false) + IfTrue v0, bb2() + Jump bb4() bb2(): - IfTrue v0, bb1() - Jump bb5() + Jump bb3() bb3(): - Jump bb4() + IfTrue v0, bb2() + Jump bb6() bb4(): - IfTrue v0, bb3() Jump bb5() bb5(): - IfTrue v0, bb0() + IfTrue v0, bb4() Jump bb6() bb6(): + IfTrue v0, bb1() + Jump bb7() + bb7(): v11:Any = Const CBool(true) Return v11 "); @@ -4729,17 +5057,18 @@ mod loop_info_tests { let retval = function.push_insn(bb2, Insn::Const { val: Const::CBool(true) }); let _ = function.push_insn(bb2, Insn::Return { val: retval }); + function.seal_entries(); let cfi = ControlFlowInfo::new(&function); let dominators = Dominators::new(&function); let loop_info = LoopInfo::new(&cfi, &dominators); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - Jump bb1() bb1(): Jump bb2() bb2(): + Jump bb3() + bb3(): v2:Any = Const CBool(true) Return v2 "); @@ -4801,23 +5130,24 @@ mod loop_info_tests { let _ = function.push_insn(bb4, Insn::IfTrue {val: cond, target: edge(bb1)}); let _ = function.push_insn(bb5, Insn::IfTrue {val: cond, target: edge(bb0)}); + function.seal_entries(); assert_snapshot!(format!("{}", FunctionPrinter::without_snapshot(&function)), @r" fn : - bb0(): - v0:Any = Const Value(false) - Jump bb1() bb1(): + v0:Any = Const Value(false) Jump bb2() bb2(): Jump bb3() bb3(): Jump bb4() - IfTrue v0, bb2() bb4(): Jump bb5() - IfTrue v0, bb1() + IfTrue v0, bb3() bb5(): - IfTrue v0, bb0() + Jump bb6() + IfTrue v0, bb2() + bb6(): + IfTrue v0, bb1() "); let cfi = ControlFlowInfo::new(&function); @@ -4866,7 +5196,7 @@ mod iongraph_tests { function.push_insn(bb0, Insn::Return { val: retval }); let json = function.to_iongraph_pass("simple"); - assert_snapshot!(json.to_string(), @r#"{"name":"simple", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[], "instructions":[{"ptr":4096, "id":0, "opcode":"Const CBool(true)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4097, "id":1, "opcode":"Return v0", "attributes":[], "inputs":[0], "uses":[], "memInputs":[], "type":""}]}]}, "lir":{"blocks":[]}}"#); + assert_snapshot!(json.to_string(), @r#"{"name":"simple", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[], "instructions":[]}]}, "lir":{"blocks":[]}}"#); } #[test] @@ -4881,7 +5211,7 @@ mod iongraph_tests { function.push_insn(bb1, Insn::Return { val: retval }); let json = function.to_iongraph_pass("two_blocks"); - assert_snapshot!(json.to_string(), @r#"{"name":"two_blocks", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[1], "instructions":[{"ptr":4096, "id":0, "opcode":"Jump bb1()", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":""}]}, {"ptr":4097, "id":1, "loopDepth":0, "attributes":[], "predecessors":[0], "successors":[], "instructions":[{"ptr":4097, "id":1, "opcode":"Const CBool(false)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4098, "id":2, "opcode":"Return v1", "attributes":[], "inputs":[1], "uses":[], "memInputs":[], "type":""}]}]}, "lir":{"blocks":[]}}"#); + assert_snapshot!(json.to_string(), @r#"{"name":"two_blocks", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[], "instructions":[]}]}, "lir":{"blocks":[]}}"#); } #[test] @@ -4893,7 +5223,7 @@ mod iongraph_tests { function.push_insn(bb0, Insn::Return { val: val1 }); let json = function.to_iongraph_pass("multiple_instructions"); - assert_snapshot!(json.to_string(), @r#"{"name":"multiple_instructions", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[], "instructions":[{"ptr":4096, "id":0, "opcode":"Const CBool(true)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4097, "id":1, "opcode":"Return v0", "attributes":[], "inputs":[0], "uses":[], "memInputs":[], "type":""}]}]}, "lir":{"blocks":[]}}"#); + assert_snapshot!(json.to_string(), @r#"{"name":"multiple_instructions", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[], "instructions":[]}]}, "lir":{"blocks":[]}}"#); } #[test] @@ -4912,7 +5242,7 @@ mod iongraph_tests { function.push_insn(bb1, Insn::Return { val: retval2 }); let json = function.to_iongraph_pass("conditional_branch"); - assert_snapshot!(json.to_string(), @r#"{"name":"conditional_branch", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[1], "instructions":[{"ptr":4096, "id":0, "opcode":"Const CBool(true)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4097, "id":1, "opcode":"IfTrue v0, bb1()", "attributes":[], "inputs":[0], "uses":[], "memInputs":[], "type":""}, {"ptr":4098, "id":2, "opcode":"Const CBool(false)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4099, "id":3, "opcode":"Return v2", "attributes":[], "inputs":[2], "uses":[], "memInputs":[], "type":""}]}, {"ptr":4097, "id":1, "loopDepth":0, "attributes":[], "predecessors":[0], "successors":[], "instructions":[{"ptr":4100, "id":4, "opcode":"Const CBool(true)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4101, "id":5, "opcode":"Return v4", "attributes":[], "inputs":[4], "uses":[], "memInputs":[], "type":""}]}]}, "lir":{"blocks":[]}}"#); + assert_snapshot!(json.to_string(), @r#"{"name":"conditional_branch", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[], "instructions":[]}]}, "lir":{"blocks":[]}}"#); } #[test] @@ -4933,7 +5263,7 @@ mod iongraph_tests { function.push_insn(bb1, Insn::Jump(edge(bb2))); let json = function.to_iongraph_pass("loop_structure"); - assert_snapshot!(json.to_string(), @r#"{"name":"loop_structure", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[2], "instructions":[{"ptr":4096, "id":0, "opcode":"Jump bb2()", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":""}, {"ptr":4097, "id":1, "opcode":"Const Value(false)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}]}, {"ptr":4098, "id":2, "loopDepth":1, "attributes":["loopheader"], "predecessors":[0, 1], "successors":[1], "instructions":[{"ptr":4098, "id":2, "opcode":"IfTrue v1, bb1()", "attributes":[], "inputs":[1], "uses":[], "memInputs":[], "type":""}, {"ptr":4099, "id":3, "opcode":"Const CBool(true)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4100, "id":4, "opcode":"Return v3", "attributes":[], "inputs":[3], "uses":[], "memInputs":[], "type":""}]}, {"ptr":4097, "id":1, "loopDepth":1, "attributes":["backedge"], "predecessors":[2], "successors":[2], "instructions":[{"ptr":4101, "id":5, "opcode":"Jump bb2()", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":""}]}]}, "lir":{"blocks":[]}}"#); + assert_snapshot!(json.to_string(), @r#"{"name":"loop_structure", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[], "instructions":[]}]}, "lir":{"blocks":[]}}"#); } #[test] @@ -4954,6 +5284,6 @@ mod iongraph_tests { function.push_insn(bb2, Insn::Return { val: retval2 }); let json = function.to_iongraph_pass("multiple_successors"); - assert_snapshot!(json.to_string(), @r#"{"name":"multiple_successors", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[1, 2], "instructions":[{"ptr":4096, "id":0, "opcode":"Const CBool(true)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4097, "id":1, "opcode":"IfTrue v0, bb1()", "attributes":[], "inputs":[0], "uses":[], "memInputs":[], "type":""}, {"ptr":4098, "id":2, "opcode":"Jump bb2()", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":""}]}, {"ptr":4097, "id":1, "loopDepth":0, "attributes":[], "predecessors":[0], "successors":[], "instructions":[{"ptr":4099, "id":3, "opcode":"Const CBool(true)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4100, "id":4, "opcode":"Return v3", "attributes":[], "inputs":[3], "uses":[], "memInputs":[], "type":""}]}, {"ptr":4098, "id":2, "loopDepth":0, "attributes":[], "predecessors":[0], "successors":[], "instructions":[{"ptr":4101, "id":5, "opcode":"Const CBool(false)", "attributes":[], "inputs":[], "uses":[], "memInputs":[], "type":"Any"}, {"ptr":4102, "id":6, "opcode":"Return v5", "attributes":[], "inputs":[5], "uses":[], "memInputs":[], "type":""}]}]}, "lir":{"blocks":[]}}"#); + assert_snapshot!(json.to_string(), @r#"{"name":"multiple_successors", "mir":{"blocks":[{"ptr":4096, "id":0, "loopDepth":0, "attributes":[], "predecessors":[], "successors":[], "instructions":[]}]}, "lir":{"blocks":[]}}"#); } } diff --git a/zjit/src/stats.rs b/zjit/src/stats.rs index 2fb233bb0f4493..23ff9b16cf77e1 100644 --- a/zjit/src/stats.rs +++ b/zjit/src/stats.rs @@ -162,6 +162,15 @@ make_counters! { invalidation_time_ns, side_exit_size, + compile_side_exit_time_ns, + + compile_hir_time_ns, + compile_hir_build_time_ns, + compile_hir_strength_reduce_time_ns, + compile_hir_fold_constants_time_ns, + compile_hir_clean_cfg_time_ns, + compile_hir_eliminate_dead_code_time_ns, + compile_lir_time_ns, } // Exit counters that are summed as side_exit_count
bb4(v26:BasicObject, v27:Falsy) 
PatchPoint NoTracePoint 
v31:Fixnum[4] = Const Value(4) 
PatchPoint NoTracePoint