-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into truffle-head
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
Showing
29 changed files
with
408 additions
and
377 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,9 +13,6 @@ | |
'tzdata.version' => '2013d', | ||
'tzdata.scope' => 'provided', | ||
|
||
'unsafe.version' => '8.92.1', | ||
'unsafe.jar' => '${settings.localRepository}/com/headius/unsafe-mock/${unsafe.version}/unsafe-mock-${unsafe.version}.jar', | ||
|
||
'maven.build.timestamp.format' => 'yyyy-MM-dd', | ||
'maven.test.skip' => 'true', | ||
'build.date' => '${maven.build.timestamp}', | ||
|
@@ -62,8 +59,7 @@ | |
|
||
jar 'com.headius:invokebinder:1.7' | ||
jar 'com.headius:options:1.4' | ||
jar 'com.headius:coro-mock:1.0', :scope => 'provided' | ||
jar 'com.headius:unsafe-mock', '${unsafe.version}', :scope => 'provided' | ||
jar 'com.headius:unsafe-fences:1.0-SNAPSHOT' | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
chrisseaton
Author
Contributor
|
||
|
||
jar 'bsf:bsf:2.4.0', :scope => 'provided' | ||
jar 'com.jcraft:jzlib:1.1.3' | ||
|
@@ -192,17 +188,13 @@ | |
'compilerArgs' => [ '-XDignore.symbol.file=true', | ||
'-J-Duser.language=en', | ||
'-J-Dfile.encoding=UTF-8', | ||
'-J-Xbootclasspath/p:${unsafe.jar}', | ||
'-Xbootclasspath/p:${unsafe.jar}', | ||
'-J-Xmx${jruby.compile.memory}' ] ) | ||
execute_goals( 'compile', | ||
:id => 'populators', | ||
:phase => 'process-classes', | ||
'compilerArgs' => [ '-XDignore.symbol.file=true', | ||
'-J-Duser.language=en', | ||
'-J-Dfile.encoding=UTF-8', | ||
'-J-Xbootclasspath/p:${unsafe.jar}', | ||
'-Xbootclasspath/p:${unsafe.jar}', | ||
'-J-Xmx${jruby.compile.memory}' ], | ||
'includes' => [ 'org/jruby/gen/**/*.java' ] ) | ||
execute_goals( 'compile', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package org.jruby; | ||
|
||
import org.jruby.ext.stringio.StringIO; | ||
|
||
/** | ||
* Flags used by RubyBasicObject descendants. | ||
*/ | ||
public interface ObjectFlags { | ||
FlagRegistry registry = new FlagRegistry(); | ||
|
||
// These flags must be registered from top of hierarchy down to maintain order. | ||
// TODO: Replace these during the build with their calculated values. | ||
int FALSE_F = registry.newFlag(RubyBasicObject.class); | ||
int NIL_F = registry.newFlag(RubyBasicObject.class); | ||
int FROZEN_F = registry.newFlag(RubyBasicObject.class); | ||
int TAINTED_F = registry.newFlag(RubyBasicObject.class); | ||
|
||
int CACHEPROXY_F = registry.newFlag(RubyModule.class); | ||
int NEEDSIMPL_F = registry.newFlag(RubyModule.class); | ||
int REFINED_MODULE_F = registry.newFlag(RubyModule.class); | ||
int IS_OVERLAID_F = registry.newFlag(RubyModule.class); | ||
|
||
int CR_7BIT_F = registry.newFlag(RubyString.class); | ||
int CR_VALID_F = registry.newFlag(RubyString.class); | ||
|
||
int STRIO_READABLE = registry.newFlag(StringIO.class); | ||
int STRIO_WRITABLE = registry.newFlag(StringIO.class); | ||
|
||
int MATCH_BUSY = registry.newFlag(RubyMatchData.class); | ||
|
||
int COMPARE_BY_IDENTITY_F = registry.newFlag(RubyHash.class); | ||
int PROCDEFAULT_HASH_F = registry.newFlag(RubyHash.class); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 0 additions & 53 deletions
53
core/src/main/java/org/jruby/internal/runtime/methods/CompiledIRMetaClassBody.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
core/src/main/java/org/jruby/internal/runtime/methods/CompiledIRNoProtocolMethod.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
package org.jruby.internal.runtime.methods; | ||
|
||
import org.jruby.RubyModule; | ||
import org.jruby.internal.runtime.AbstractIRMethod; | ||
import org.jruby.ir.IRFlags; | ||
import org.jruby.ir.IRMethod; | ||
import org.jruby.ir.IRScope; | ||
import org.jruby.ir.interpreter.InterpreterContext; | ||
import org.jruby.parser.StaticScope; | ||
import org.jruby.runtime.ArgumentDescriptor; | ||
import org.jruby.runtime.Block; | ||
import org.jruby.runtime.DynamicScope; | ||
import org.jruby.runtime.Helpers; | ||
import org.jruby.runtime.ThreadContext; | ||
import org.jruby.runtime.Visibility; | ||
import org.jruby.runtime.builtin.IRubyObject; | ||
|
||
import java.lang.invoke.MethodHandle; | ||
|
||
public class CompiledIRNoProtocolMethod extends AbstractIRMethod { | ||
private final boolean scope; | ||
private final MethodHandle variable; | ||
|
||
public CompiledIRNoProtocolMethod(MethodHandle handle, IRScope scope, RubyModule implementationClass) { | ||
super(scope, Visibility.PUBLIC, implementationClass); | ||
|
||
this.scope = !scope.getFlags().contains(IRFlags.DYNSCOPE_ELIMINATED); | ||
this.variable = handle; | ||
} | ||
|
||
public ArgumentDescriptor[] getArgumentDescriptors() { | ||
return ArgumentDescriptor.EMPTY_ARRAY; | ||
} | ||
|
||
@Override | ||
public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, Block block) { | ||
StaticScope staticScope1 = this.staticScope; | ||
RubyModule implementationClass1 = this.implementationClass; | ||
pre(context, staticScope1, implementationClass1, self, name, block); | ||
|
||
try { | ||
return (IRubyObject) this.variable.invokeExact(context, staticScope1, self, IRubyObject.NULL_ARRAY, block, implementationClass1, name); | ||
} catch (Throwable t) { | ||
Helpers.throwException(t); | ||
return null; // not reached | ||
} finally { | ||
post(context); | ||
} | ||
} | ||
|
||
@Override | ||
public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject[] args, Block block) { | ||
throw new RuntimeException("BUG: this path should never be called"); | ||
} | ||
|
||
@Override | ||
public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, Block block) { | ||
throw new RuntimeException("BUG: this path should never be called"); | ||
} | ||
|
||
@Override | ||
public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, Block block) { | ||
throw new RuntimeException("BUG: this path should never be called"); | ||
} | ||
|
||
@Override | ||
public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name, IRubyObject arg0, IRubyObject arg1, IRubyObject arg2, Block block) { | ||
throw new RuntimeException("BUG: this path should never be called"); | ||
} | ||
|
||
protected void post(ThreadContext context) { | ||
// update call stacks (pop: ..) | ||
context.popFrame(); | ||
if (scope) { | ||
context.popScope(); | ||
} | ||
} | ||
|
||
protected void pre(ThreadContext context, StaticScope staticScope, RubyModule implementationClass, IRubyObject self, String name, Block block) { | ||
// update call stacks (push: frame, class, scope, etc.) | ||
context.preMethodFrameOnly(implementationClass, name, self, block); | ||
if (scope) { | ||
// Add a parent-link to current dynscope to support non-local returns cheaply | ||
// This doesn't affect variable scoping since local variables will all have | ||
// the right scope depth. | ||
context.pushScope(DynamicScope.newDynamicScope(staticScope, context.getCurrentScope())); | ||
} | ||
context.setCurrentVisibility(getVisibility()); | ||
} | ||
|
||
@Override | ||
public InterpreterContext ensureInstrsReady() { | ||
// FIXME: duplicated from MixedModeIRMethod | ||
if (method instanceof IRMethod) { | ||
return ((IRMethod) method).lazilyAcquireInterpreterContext(); | ||
} | ||
|
||
InterpreterContext ic = method.getInterpreterContext(); | ||
|
||
return ic; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
core/src/main/java/org/jruby/javasupport/DummyForJavaUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package org.jruby.javasupport; | ||
|
||
/** | ||
* This class exists only for access-checks to set {@linkplain JavaUtil#CAN_SET_ACCESSIBLE} | ||
*/ | ||
public class DummyForJavaUtil { | ||
|
||
private static final Object PRIVATE = new Object[0]; | ||
public static final Object PUBLIC = PRIVATE; | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SNAPSHOT dependency!