[Truffle] Add a getSymbol to CoreString

jruby · Mar 16, 2016 · d1c95c2 · d1c95c2 · chrisseaton · Mar 16, 2016
1 parent daa3572
commit d1c95c2
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/CoreString.java b/truffle/src/main/java/org/jruby/truffle/core/string/CoreString.java
@@ -25,6 +25,7 @@ public class CoreString {
     private final String literal;
 
     @CompilationFinal private volatile Rope rope;
+    @CompilationFinal private volatile DynamicObject symbol;
 
     public CoreString(RubyContext context, String literal) {
         assert is7Bit(literal);
@@ -35,17 +36,23 @@ public CoreString(RubyContext context, String literal) {
     public Rope getRope() {
         if (rope == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            rope = createRope();
+
+            rope = context.getRopeTable().getRope(
+                    literal.getBytes(StandardCharsets.US_ASCII),
+                    ASCIIEncoding.INSTANCE,
+                    CodeRange.CR_7BIT);
         }
+
         return rope;
     }
 
-    private Rope createRope() {
-        // RopeTable.getRope is fully synchronized and returns the same object for equivalent parameters
-        return context.getRopeTable().getRope(
-                literal.getBytes(StandardCharsets.US_ASCII),
-                ASCIIEncoding.INSTANCE,
-                CodeRange.CR_7BIT);
+    public DynamicObject getSymbol() {
+        if (symbol == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            symbol = context.getSymbolTable().getSymbol(getRope());
+        }
+
+        return symbol;
     }
 
     public DynamicObject createInstance() {