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

Commits on Jun 27, 2016

  1. Revert "[Truffle] If you don't invalidate the $value global, it'll ca…

    …use a de-opt storm in the PE tests."
    
    This reverts commit 4642476.
    chrisseaton committed Jun 27, 2016
    Copy the full SHA
    3fa6a11 View commit details
  2. 2
    Copy the full SHA
    33d7d4d View commit details
10 changes: 4 additions & 6 deletions test/truffle/compiler/pe/pe.rb
Original file line number Diff line number Diff line change
@@ -110,8 +110,6 @@ def report(status, code, message = nil)
puts message ? format(format_str + "\n %s", status, code, message) : format('%14s: %s', status, code)
end

Truffle::Globals.permanently_invalidate :$value

EXAMPLES.each do |example|
next if example.tagged

@@ -120,14 +118,14 @@ def report(status, code, message = nil)
runner = proc do
begin
tested += 1
$value = nil
eval "
def test_pe_code
$value = Truffle::Graal.assert_constant(begin; #{example.code}; end)
value = Truffle::Graal.assert_constant(begin; #{example.code}; end)
Truffle::Graal.assert_not_compiled
value
end"
while true
test_pe_code
value = test_pe_code
end
rescue RubyTruffleError => e
if e.message.include? 'Truffle::Graal.assert_not_compiled'
@@ -147,7 +145,7 @@ def test_pe_code
report 'FAILED', example.code, "wasn't constant"
failed += 1
else
if $value == example.expected_value
if value == example.expected_value
report 'OK', example.code
else
report 'INCORRECT', example.code, "was: #{$value.inspect} and not: #{example.expected_value.inspect}"
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
Original file line number Diff line number Diff line change
@@ -108,8 +108,6 @@
import org.jruby.truffle.language.control.TruffleFatalException;
import org.jruby.truffle.language.globals.GlobalVariableStorage;
import org.jruby.truffle.language.globals.GlobalVariables;
import org.jruby.truffle.language.globals.TruffleGlobalsNodes;
import org.jruby.truffle.language.globals.TruffleGlobalsNodesFactory;
import org.jruby.truffle.language.loader.CodeLoader;
import org.jruby.truffle.language.loader.SourceLoader;
import org.jruby.truffle.language.methods.DeclarationContext;
@@ -623,7 +621,6 @@ public CoreLibrary(RubyContext context) {
defineModule(truffleModule, "Process");
defineModule(truffleModule, "Binding");
defineModule(truffleModule, "POSIX");
defineModule(truffleModule, "Globals");
psychModule = defineModule("Psych");
psychParserClass = defineClass(psychModule, objectClass, "Parser");
final DynamicObject psychHandlerClass = defineClass(psychModule, objectClass, "Handler");
@@ -846,7 +843,6 @@ public void addCoreMethods() {
coreMethodNodeManager.addCoreMethodNodes(TruffleBindingNodesFactory.getFactories());
coreMethodNodeManager.addCoreMethodNodes(TruffleArrayNodesFactory.getFactories());
coreMethodNodeManager.addCoreMethodNodes(TruffleStringNodesFactory.getFactories());
coreMethodNodeManager.addCoreMethodNodes(TruffleGlobalsNodesFactory.getFactories());
coreMethodNodeManager.addCoreMethodNodes(BCryptNodesFactory.getFactories());
return null;
}));
Original file line number Diff line number Diff line change
@@ -66,9 +66,4 @@ public void setValue(Object value) {
}
}

public void permanentlyInvalidate() {
changes = Integer.MAX_VALUE;
unchangedAssumption.invalidate();
}

}

This file was deleted.