[Truffle] Place a boundary on all source loading.

jruby · Oct 15, 2016 · c9ca611 · eregon · Oct 18, 2016 · c9ca611
1 parent 239bcc6
commit c9ca611
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java b/truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.vm.PolyglotEngine;
 import org.jruby.JRubyTruffleInterface;
@@ -49,6 +50,7 @@ public void dispose() {
         engine.dispose();
     }
 
+    @TruffleBoundary
     private Source loadSource(String source, String name) {
         return Source.newBuilder(source).name(name).mimeType(RubyLanguage.MIME_TYPE).build();
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/core/CoreLibrary.java
@@ -155,7 +155,7 @@ public class CoreLibrary {
 
     private final RubyContext context;
 
-    private final Source source = Source.newBuilder("").name("(core)").mimeType(RubyLanguage.MIME_TYPE).build();
+    private final Source source = initCoreSource();
     private final SourceSection sourceSection = source.createUnavailableSection();
 
     private final DynamicObject argumentErrorClass;
@@ -290,6 +290,11 @@ public class CoreLibrary {
 
     private final String coreLoadPath;
 
+    @TruffleBoundary
+    private static Source initCoreSource() {
+        return Source.newBuilder("").name("(core)").mimeType(RubyLanguage.MIME_TYPE).build();
+    }
+
     private String buildCoreLoadPath() {
         String path = context.getOptions().CORE_LOAD_PATH;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/debug/DebugHelpers.java b/truffle/src/main/java/org/jruby/truffle/debug/DebugHelpers.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.debug;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -33,6 +34,7 @@ public static Object eval(String code, Object... arguments) {
     }
 
     @Deprecated
+    @TruffleBoundary
     public static Object eval(RubyContext context, String code, Object... arguments) {
         final FrameInstance currentFrameInstance = Truffle.getRuntime().getCurrentFrame();
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/loader/SourceLoader.java b/truffle/src/main/java/org/jruby/truffle/language/loader/SourceLoader.java
@@ -9,6 +9,7 @@
  */
 package org.jruby.truffle.language.loader;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.source.Source;
 import org.jruby.Ruby;
 import org.jruby.truffle.RubyContext;
@@ -36,6 +37,7 @@ public SourceLoader(RubyContext context) {
         this.context = context;
     }
 
+    @TruffleBoundary
     public Source load(String canonicalPath) throws IOException {
         if (canonicalPath.equals("-e")) {
             return loadFragment(new String(context.getJRubyRuntime().getInstanceConfig().inlineScript(), StandardCharsets.UTF_8), "-e");
@@ -57,10 +59,12 @@ public Source load(String canonicalPath) throws IOException {
         }
     }
 
+    @TruffleBoundary
     public Source loadFragment(String fragment, String name) {
         return Source.newBuilder(fragment).name(name).mimeType(RubyLanguage.MIME_TYPE).build();
     }
 
+    @TruffleBoundary
     private Source loadResource(String path) throws IOException {
         if (!path.toLowerCase(Locale.ENGLISH).endsWith(".rb")) {
             throw new FileNotFoundException(path);