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

Commits on Oct 20, 2016

  1. Copy the full SHA
    25087c6 View commit details
  2. Copy the full SHA
    1e23335 View commit details
  3. Copy the full SHA
    74ffd56 View commit details
  4. [Truffle] Eclipse: do not remove whitespace for all lines.

    * Since other editors obviously don't and it adds lots of noise and potentially conflicts.
    eregon committed Oct 20, 2016
    Copy the full SHA
    8b7c038 View commit details
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -126,9 +126,6 @@ build.eclipse
/RUBY.dist
/RUBY-TEST.dist

# Antlr (when launched by mx)
/truffle/src/main/antlr4/**/*.java

# Truffle findbugs
truffle-findbugs-report.html
findbugs-noUpdateChecks-3.0.0.tar.gz
1 change: 1 addition & 0 deletions mx.jruby/eclipse-settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
1 change: 1 addition & 0 deletions mx.jruby/eclipse-settings/org.eclipse.jdt.ui.prefs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
sp_cleanup.format_source_code_changes_only=true
sp_cleanup.on_save_use_additional_actions=false
Original file line number Diff line number Diff line change
@@ -194,8 +194,6 @@ public GetIndexNode(RubyContext context, SourceSection sourceSection) {

@Specialization(guards = "isNullHash(hash)")
public Object getNull(VirtualFrame frame, DynamicObject hash, Object key) {
hashNode.hash(frame, key);

if (undefinedValue != null) {
return undefinedValue;
} else {