Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Truffle-related clean up and simplifications. #2422

Merged
merged 6 commits into from Jan 4, 2015
Merged

Truffle-related clean up and simplifications. #2422

merged 6 commits into from Jan 4, 2015

Commits on Jan 2, 2015

  1. [Truffle] Simplify IfNode via using Truffle API BranchProfile utility.

    @thomaswue
    thomaswue committed Jan 2, 2015
    Copy the full SHA
    c1d69f7 View commit details
    Browse the repository at this point in the history

  2. [Truffle] Use ConditionProfile also in OrNode.

    @thomaswue
    thomaswue committed Jan 2, 2015
    Copy the full SHA
    87c0c4a View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2015

  1. Merge https://github.com/jruby/jruby 

    Conflicts:
	core/src/main/java/org/jruby/truffle/nodes/control/IfNode.java
	core/src/main/java/org/jruby/truffle/nodes/control/OrNode.java
    @thomaswue
    thomaswue committed Jan 4, 2015
    Copy the full SHA
    a70d9f2 View commit details
    Browse the repository at this point in the history

  2. [Truffle] Fix imports.

    @thomaswue
    thomaswue committed Jan 4, 2015
    Copy the full SHA
    f720973 View commit details
    Browse the repository at this point in the history

  3. [Truffle] Clean up changes.

    @thomaswue
    thomaswue committed Jan 4, 2015
    Copy the full SHA
    e0df8d5 View commit details
    Browse the repository at this point in the history

  4. [Truffle] Replace tabs with spaces.

    @thomaswue
    thomaswue committed Jan 4, 2015
    Copy the full SHA
    2db47b9 View commit details
    Browse the repository at this point in the history