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: 625dbd3c1dc8
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2251ef3656b7
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 10, 2016

  1. Copy the full SHA
    72bbaf4 View commit details
  2. Copy the full SHA
    b7f4b49 View commit details
  3. Copy the full SHA
    2251ef3 View commit details
3 changes: 3 additions & 0 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -315,6 +315,9 @@ def printable_cmd(args)
if Hash === args.first
env, *args = args
end
if Hash === args.last && args.last.empty?
*args, options = args
end
env = env.map { |k,v| "#{k}=#{shellescape(v)}" }.join(' ')
args = args.map { |a| shellescape(a) }.join(' ')
env.empty? ? args : "#{env} #{args}"
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@ private TruffleObject getInitFunction(final String expandedPath) {
final Object initFunction = getContext().getEnv().importSymbol("@Init_" + getBaseName(expandedPath));

if (!(initFunction instanceof TruffleObject)) {
throw new UnsupportedOperationException();
throw new UnsupportedOperationException("initFunction is not a TruffleObject but a " + initFunction.getClass());
}

return (TruffleObject) initFunction;
Original file line number Diff line number Diff line change
@@ -162,24 +162,29 @@ public DynamicObject translate(Throwable throwable) {
throwable.printStackTrace();
}

final String message;
final String message = throwable.getMessage();
final String reportedMessage;

if (throwable.getMessage() != null && throwable.getMessage().startsWith("LLVM error")) {
message = throwable.getMessage();
if (message != null && message.startsWith("LLVM error")) {
reportedMessage = message;
} else {
final StringBuilder messageBuilder = new StringBuilder();
messageBuilder.append(throwable.getClass().getSimpleName());
messageBuilder.append(" ");
messageBuilder.append(throwable.getMessage());
if (message != null) {
messageBuilder.append(message);
} else {
messageBuilder.append("<no message>");
}

if (throwable.getStackTrace().length > 0) {
messageBuilder.append(" ");
messageBuilder.append(throwable.getStackTrace()[0].toString());
}
message = messageBuilder.toString();
reportedMessage = messageBuilder.toString();
}

return coreExceptions().internalError(message, this, throwable);
return coreExceptions().internalError(reportedMessage, this, throwable);
}

}