Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 83ca4b6f3bd4
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9bb416f89191
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 25, 2016

  1. [Truffle] bundle-workarounds: do not trap signals in bundle exec

    fails with unknown signal error
    pitr-ch committed Oct 25, 2016
    Copy the full SHA
    d2a9069 View commit details
  2. 5
    Copy the full SHA
    ae5a183 View commit details
  3. [Truffle] include core paths

    pitr-ch committed Oct 25, 2016
    Copy the full SHA
    9bb416f View commit details
36 changes: 36 additions & 0 deletions lib/ruby/truffle/truffle/bundler-workarounds.rb
Original file line number Diff line number Diff line change
@@ -615,3 +615,39 @@ def build_extensions
end

puts "==========================================" if $VERBOSE

native_extensions = <<-HEREDOC
==========================================
Workaround: Do not setup signal traps
Error: Some signals are not recognized
HEREDOC
puts native_extensions if $VERBOSE

require 'bundler/cli'
require 'bundler/cli/exec'

module Bundler
class CLI::Exec
def kernel_load(file, *args)
args.pop if args.last.is_a?(Hash)
ARGV.replace(args)
$0 = file
Process.setproctitle(process_title(file, args)) if Process.respond_to?(:setproctitle)
ui = Bundler.ui
Bundler.ui = nil
require "bundler/setup"
signals = Signal.list.keys - RESERVED_SIGNALS
# signals.each {|s| trap(s, "DEFAULT") } Commented out
Kernel.load(file)
rescue SystemExit
raise
rescue Exception => e # rubocop:disable Lint/RescueException
Bundler.ui = ui
Bundler.ui.error "bundler: failed to load command: #{cmd} (#{file})"
backtrace = e.backtrace.take_while {|bt| !bt.start_with?(__FILE__) }
abort "#{e.class}: #{e.message}\n #{backtrace.join("\n ")}"
end
end
end

puts "==========================================" if $VERBOSE
11 changes: 11 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/core/VMPrimitiveNodes.java
Original file line number Diff line number Diff line change
@@ -590,5 +590,16 @@ public DynamicObject setClass(DynamicObject object, DynamicObject newClass) {

}

@Primitive(name = "vm_set_process_title", needsSelf = false)
public abstract static class VMSetProcessTitlePrimitiveNode extends PrimitiveArrayArgumentsNode {

@Specialization(guards = "isRubyString(title)")
public DynamicObject setClass(DynamicObject title) {
// no-op
return title;
}

}


}
Original file line number Diff line number Diff line change
@@ -56,7 +56,8 @@ public static BacktraceFormatter createDefaultFormatter(RubyContext context) {

// For debugging
public static List<String> rubyBacktrace(RubyContext context) {
return BacktraceFormatter.createDefaultFormatter(context).formatBacktrace(context, null, context.getCallStack().getBacktrace(null));
return new BacktraceFormatter(context, EnumSet.of(FormattingFlags.INCLUDE_CORE_FILES)).
formatBacktrace(context, null, context.getCallStack().getBacktrace(null));
}

// For debugging