jruby · Feb 20, 2016 · Feb 20, 2016 · Feb 20, 2016 · Feb 20, 2016 · Feb 20, 2016
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -246,6 +246,7 @@ public class Options {
     public static final Option<Integer> TRUFFLE_PACK_CACHE = integer(TRUFFLE, "truffle.pack.cache", TRUFFLE_DEFAULT_CACHE.load(), "Array#pack cache size");
     public static final Option<Integer> TRUFFLE_UNPACK_CACHE = integer(TRUFFLE, "truffle.unpack.cache", TRUFFLE_DEFAULT_CACHE.load(), "String#unpack cache size");
     public static final Option<Integer> TRUFFLE_EVAL_CACHE = integer(TRUFFLE, "truffle.eval.cache", TRUFFLE_DEFAULT_CACHE.load(), "eval lookup cache size");
+    public static final Option<Integer> TRUFFLE_CLASS_CACHE = integer(TRUFFLE, "truffle.class.cache", TRUFFLE_DEFAULT_CACHE.load(), ".class and .metaclass cache size");
     public static final Option<Integer> TRUFFLE_ENCODING_COMPATIBLE_QUERY_CACHE = integer(TRUFFLE, "truffle.encoding_compatible_query.cache", TRUFFLE_DEFAULT_CACHE.load(), "Encoding.compatible? cache size");
 
     public static final Option<Boolean> TRUFFLE_CLONE_DEFAULT = bool(TRUFFLE, "truffle.clone.default", true, "Default option for cloning.");

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -926,8 +926,8 @@ public DynamicObject systemStackError(String message, Node currentNode) {
         return ExceptionNodes.createRubyException(systemStackErrorClass, StringOperations.createString(context, StringOperations.encodeRope(message, UTF8Encoding.INSTANCE)), context.getCallStack().getBacktrace(currentNode));
     }
 
+    @TruffleBoundary
     public DynamicObject frozenError(String className, Node currentNode) {
-        CompilerAsserts.neverPartOfCompilation();
         return runtimeError(String.format("can't modify frozen %s", className), currentNode);
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/MainNodes.java b/truffle/src/main/java/org/jruby/truffle/core/MainNodes.java
@@ -34,7 +34,7 @@ public PublicNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public DynamicObject doPublic(VirtualFrame frame, Object[] args) {
-            final DynamicObject object = getContext().getCoreLibrary().getObjectClass();
+            final DynamicObject object = coreLibrary().getObjectClass();
             return publicNode.executePublic(frame, object, args);
         }
     }
@@ -51,7 +51,7 @@ public PrivateNode(RubyContext context, SourceSection sourceSection) {
 
         @Specialization
         public DynamicObject doPrivate(VirtualFrame frame, Object[] args) {
-            final DynamicObject object = getContext().getCoreLibrary().getObjectClass();
+            final DynamicObject object = coreLibrary().getObjectClass();
             return privateNode.executePrivate(frame, object, args);
         }
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/MathNodes.java b/truffle/src/main/java/org/jruby/truffle/core/MathNodes.java
@@ -39,7 +39,7 @@ public ACosNode(RubyContext context, SourceSection sourceSection) {
         protected double doFunction(double a) {
             if (a < -1.0 || a > 1.0) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("acos", this));
+                throw new RaiseException(coreLibrary().mathDomainError("acos", this));
             }
 
             return Math.acos(a);
@@ -62,7 +62,7 @@ protected double doFunction(double a) {
                 return Double.NaN;
             } else if (a < 1) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("acosh", this));
+                throw new RaiseException(coreLibrary().mathDomainError("acosh", this));
             } else if (a < 94906265.62) {
                 return Math.log(a + Math.sqrt(a * a - 1.0));
             } else{
@@ -83,7 +83,7 @@ public ASinNode(RubyContext context, SourceSection sourceSection) {
         protected double doFunction(double a) {
             if (a < -1.0 || a > 1.0) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("asin", this));
+                throw new RaiseException(coreLibrary().mathDomainError("asin", this));
             }
 
             return Math.asin(a);
@@ -162,7 +162,7 @@ protected double doFunction(double a) {
 
             if (a < -1.0 || a > 1.0) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("atanh", this));
+                throw new RaiseException(coreLibrary().mathDomainError("atanh", this));
             }
 
             final double y = Math.abs(a);
@@ -358,16 +358,16 @@ public DynamicObject frexp(double a) {
                 for (; mantissa >= 1.0; mantissa *= 0.5, exponent +=1) { }
             }
 
-            return Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), new Object[]{sign * mantissa, exponent}, 2);
+            return Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), new Object[]{sign * mantissa, exponent}, 2);
         }
 
         @Fallback
         public DynamicObject frexp(VirtualFrame frame, Object a) {
-            if (isANode.executeIsA(a, getContext().getCoreLibrary().getNumericClass())) {
+            if (isANode.executeIsA(a, coreLibrary().getNumericClass())) {
                 return frexp(floatNode.callFloat(frame, a, "to_f", null));
             } else {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().typeErrorCantConvertInto(a, "Float", this));
+                throw new RaiseException(coreLibrary().typeErrorCantConvertInto(a, "Float", this));
             }
         }
 
@@ -386,7 +386,7 @@ protected double doFunction(double a) {
 
             if (a == -1) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("gamma", this));
+                throw new RaiseException(coreLibrary().mathDomainError("gamma", this));
             }
 
             if (Double.isNaN(a)) {
@@ -398,7 +398,7 @@ protected double doFunction(double a) {
                     return Double.POSITIVE_INFINITY;
                 } else {
                     CompilerDirectives.transferToInterpreter();
-                    throw new RaiseException(getContext().getCoreLibrary().mathDomainError("gamma", this));
+                    throw new RaiseException(coreLibrary().mathDomainError("gamma", this));
                 }
             }
 
@@ -418,7 +418,7 @@ protected double doFunction(double a) {
 
             if (Double.isNaN(a)) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("gamma", this));
+                throw new RaiseException(coreLibrary().mathDomainError("gamma", this));
             }
 
             return result;
@@ -513,21 +513,21 @@ public double function(double a, long b) {
         public double function(double a, double b) {
             if (Double.isNaN(b)) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().rangeError("float", Double.toString(b), "integer", this));
+                throw new RaiseException(coreLibrary().rangeError("float", Double.toString(b), "integer", this));
             }
 
             return a * Math.pow(2, b);
         }
 
         @Fallback
         public double function(VirtualFrame frame, Object a, Object b) {
-            if (isANode.executeIsA(a, getContext().getCoreLibrary().getNumericClass())) {
+            if (isANode.executeIsA(a, coreLibrary().getNumericClass())) {
                 return function(
                         floatANode.callFloat(frame, a, "to_f", null),
                         integerBNode.callLongFixnum(frame, b, "to_int", null));
             } else {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().typeErrorCantConvertInto(a, "Float", this));
+                throw new RaiseException(coreLibrary().typeErrorCantConvertInto(a, "Float", this));
             }
         }
 
@@ -568,21 +568,21 @@ public DynamicObject lgamma(double a) {
 
             if (a < 0 && Double.isInfinite(a)) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("log2", this));
+                throw new RaiseException(coreLibrary().mathDomainError("log2", this));
             }
 
             final RubyMath.NemesLogGamma l = new RubyMath.NemesLogGamma(a);
 
-            return Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), new Object[]{l.value, l.sign}, 2);
+            return Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), new Object[]{l.value, l.sign}, 2);
         }
 
         @Fallback
         public DynamicObject lgamma(VirtualFrame frame, Object a) {
-            if (isANode.executeIsA(a, getContext().getCoreLibrary().getNumericClass())) {
+            if (isANode.executeIsA(a, coreLibrary().getNumericClass())) {
                 return lgamma(floatNode.callFloat(frame, a, "to_f", null));
             } else {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().typeErrorCantConvertInto(a, "Float", this));
+                throw new RaiseException(coreLibrary().typeErrorCantConvertInto(a, "Float", this));
             }
         }
 
@@ -617,18 +617,18 @@ public double function(double a, NotProvided b) {
 
         @Specialization
         public double function(VirtualFrame frame, Object a, NotProvided b) {
-            if (isANode.executeIsA(a, getContext().getCoreLibrary().getNumericClass())) {
+            if (isANode.executeIsA(a, coreLibrary().getNumericClass())) {
                 return doFunction(floatANode.callFloat(frame, a, "to_f", null));
             } else {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().typeErrorCantConvertInto(a, "Float", this));
+                throw new RaiseException(coreLibrary().typeErrorCantConvertInto(a, "Float", this));
             }
         }
 
         private double doFunction(double a) {
             if (a < 0) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("log", this));
+                throw new RaiseException(coreLibrary().mathDomainError("log", this));
             }
 
             return Math.log(a);
@@ -638,7 +638,7 @@ private double doFunction(double a) {
         protected double doFunction(double a, double b) {
             if (a < 0) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("log", this));
+                throw new RaiseException(coreLibrary().mathDomainError("log", this));
             }
 
             return Math.log(a) / Math.log(b);
@@ -657,7 +657,7 @@ public Log10Node(RubyContext context, SourceSection sourceSection) {
         protected double doFunction(double a) {
             if (a < 0) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("log10", this));
+                throw new RaiseException(coreLibrary().mathDomainError("log10", this));
             }
 
             return Math.log10(a);
@@ -678,7 +678,7 @@ public Log2Node(RubyContext context, SourceSection sourceSection) {
         protected double doFunction(double a) {
             if (a < 0) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().mathDomainError("log2", this));
+                throw new RaiseException(coreLibrary().mathDomainError("log2", this));
             }
 
             return Math.log(a) / LOG2;
@@ -795,11 +795,11 @@ public double function(double a) {
 
         @Fallback
         public double function(VirtualFrame frame, Object a) {
-            if (isANode.executeIsA(a, getContext().getCoreLibrary().getNumericClass())) {
+            if (isANode.executeIsA(a, coreLibrary().getNumericClass())) {
                 return doFunction(floatNode.callFloat(frame, a, "to_f", null));
             } else {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().typeErrorCantConvertInto(a, "Float", this));
+                throw new RaiseException(coreLibrary().typeErrorCantConvertInto(a, "Float", this));
             }
         }
 
@@ -906,15 +906,15 @@ public double function(double a, double b) {
 
         @Fallback
         public double function(VirtualFrame frame, Object a, Object b) {
-            if (isANode.executeIsA(a, getContext().getCoreLibrary().getNumericClass()) &&
-                    isANode.executeIsA(b, getContext().getCoreLibrary().getNumericClass())) {
+            if (isANode.executeIsA(a, coreLibrary().getNumericClass()) &&
+                    isANode.executeIsA(b, coreLibrary().getNumericClass())) {
                 return doFunction(
                         floatANode.callFloat(frame, a, "to_f", null),
                         floatBNode.callFloat(frame, b, "to_f", null));
             } else {
                 CompilerDirectives.transferToInterpreter();
 
-                throw new RaiseException(getContext().getCoreLibrary().typeErrorCantConvertInto(a, "Float", this));
+                throw new RaiseException(coreLibrary().typeErrorCantConvertInto(a, "Float", this));
             }
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/ProcessNodes.java b/truffle/src/main/java/org/jruby/truffle/core/ProcessNodes.java
@@ -86,7 +86,7 @@ private Object clock_gettime_clock_id(int clock_id, DynamicObject unit) {
             int r = libCClockGetTime.clock_gettime(clock_id, timeSpec);
             if (r != 0) {
                 CompilerDirectives.transferToInterpreter();
-                throw new RaiseException(getContext().getCoreLibrary().systemCallError("clock_gettime failed: " + r, this));
+                throw new RaiseException(coreLibrary().systemCallError("clock_gettime failed: " + r, this));
             }
             long nanos = timeSpec.getTVsec() * 1_000_000_000 + timeSpec.getTVnsec();
             return timeToUnit(nanos, unit);
@@ -146,7 +146,7 @@ private int raise(String signalName) {
             try {
                 getContext().getNativePlatform().getSignalManager().raise(signal);
             } catch (IllegalArgumentException e) {
-                throw new RaiseException(getContext().getCoreLibrary().argumentError(e.getMessage(), this));
+                throw new RaiseException(coreLibrary().argumentError(e.getMessage(), this));
             }
             return 1;
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/RaiseIfFrozenNode.java b/truffle/src/main/java/org/jruby/truffle/core/RaiseIfFrozenNode.java
@@ -34,8 +34,8 @@ public Object execute(VirtualFrame frame) {
 
         if (isFrozenNode.executeIsFrozen(result)) {
             CompilerDirectives.transferToInterpreter();
-            throw new RaiseException(getContext().getCoreLibrary().frozenError(
-                    Layouts.MODULE.getFields(getContext().getCoreLibrary().getLogicalClass(result)).getName(), this));
+            throw new RaiseException(coreLibrary().frozenError(
+                    Layouts.MODULE.getFields(coreLibrary().getLogicalClass(result)).getName(), this));
         }
 
         return result;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/SetTopLevelBindingNode.java b/truffle/src/main/java/org/jruby/truffle/core/SetTopLevelBindingNode.java
@@ -25,7 +25,7 @@ public SetTopLevelBindingNode(RubyContext context, SourceSection sourceSection)
     @Override
     public Object execute(VirtualFrame frame) {
         final DynamicObject binding = BindingNodes.createBinding(getContext(), frame.materialize());
-        Layouts.MODULE.getFields(getContext().getCoreLibrary().getObjectClass()).setConstant(getContext(), this, "TOPLEVEL_BINDING", binding);
+        Layouts.MODULE.getFields(coreLibrary().getObjectClass()).setConstant(getContext(), this, "TOPLEVEL_BINDING", binding);
         return nil();
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java b/truffle/src/main/java/org/jruby/truffle/core/array/ArrayConcatNode.java
@@ -63,7 +63,7 @@ private DynamicObject executeSingle(VirtualFrame frame, Object store, int length
             store = arrayBuilderNode.appendValue(store, length, childObject);
             length++;
         }
-        return Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), arrayBuilderNode.finish(store, length), length);
+        return Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), arrayBuilderNode.finish(store, length), length);
     }
 
     @ExplodeLoop
@@ -85,7 +85,7 @@ private DynamicObject executeRubyArray(VirtualFrame frame, Object store, int len
             }
         }
 
-        return Layouts.ARRAY.createArray(getContext().getCoreLibrary().getArrayFactory(), arrayBuilderNode.finish(store, length), length);
+        return Layouts.ARRAY.createArray(coreLibrary().getArrayFactory(), arrayBuilderNode.finish(store, length), length);
     }
 
     @ExplodeLoop