jruby · Feb 22, 2016 · Feb 22, 2016 · Feb 22, 2016
diff --git a/test/truffle/compiler/pe/language/defined_pe.rb b/test/truffle/compiler/pe/language/defined_pe.rb
@@ -0,0 +1,13 @@
+# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+# 
+# Eclipse Public License version 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
+tagged_example "defined?(true) == 'true'", true
+tagged_example "defined?(false) == 'false'", true
+tagged_example "defined?(self) == 'self'", true
+tagged_example "defined?(14) == 'expression'", true
+tagged_example "defined?(14 + 2) == 'expression'", true
diff --git a/test/truffle/compiler/pe/pe.rb b/test/truffle/compiler/pe/pe.rb
@@ -65,6 +65,7 @@ def tagged_counter_example(code)
   require_relative 'language/ivar_pe.rb'
   require_relative 'language/metaprogramming_pe.rb'
   require_relative 'language/super_pe.rb'
+  require_relative 'language/defined_pe.rb'
   require_relative 'core/truefalse_pe.rb'
   require_relative 'core/fixnum_pe.rb'
   require_relative 'core/float_pe.rb'

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/CoreStrings.java b/truffle/src/main/java/org/jruby/truffle/core/string/CoreStrings.java
@@ -13,13 +13,24 @@
 
 public class CoreStrings {
 
-    private final RubyContext context;
-
+    public final CoreString ASSIGNMENT;
+    public final CoreString CLASS_VARIABLE;
+    public final CoreString EXPRESSION;
+    public final CoreString FALSE;
+    public final CoreString INSTANCE_VARIABLE;
     public final CoreString NIL;
+    public final CoreString SELF;
+    public final CoreString TRUE;
 
     public CoreStrings(RubyContext context) {
-        this.context = context;
+        ASSIGNMENT = new CoreString(context, "assignment");
+        CLASS_VARIABLE = new CoreString(context, "class variable");
+        EXPRESSION = new CoreString(context, "expression");
+        FALSE = new CoreString(context, "false");
+        INSTANCE_VARIABLE = new CoreString(context, "instance-variable");
         NIL = new CoreString(context, "nil");
+        SELF = new CoreString(context, "self");
+        TRUE = new CoreString(context, "true");
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/language/RubyNode.java
@@ -53,7 +53,7 @@ public void executeVoid(VirtualFrame frame) {
     }
 
     public Object isDefined(VirtualFrame frame) {
-        return create7BitString("expression", UTF8Encoding.INSTANCE);
+        return coreStrings().EXPRESSION.createInstance();
     }
 
     // Utility methods to execute and expect a particular type

diff --git a/truffle/src/main/java/org/jruby/truffle/language/literal/BooleanLiteralNode.java b/truffle/src/main/java/org/jruby/truffle/language/literal/BooleanLiteralNode.java
@@ -39,7 +39,11 @@ public Object execute(VirtualFrame frame) {
 
     @Override
     public Object isDefined(VirtualFrame frame) {
-        return create7BitString(Boolean.toString(value), UTF8Encoding.INSTANCE);
+        if (value) {
+            return coreStrings().TRUE.createInstance();
+        } else {
+            return coreStrings().FALSE.createInstance();
+        }
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/ReadClassVariableNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/ReadClassVariableNode.java
@@ -59,7 +59,7 @@ public Object isDefined(VirtualFrame frame) {
         if (value == null) {
             return nil();
         } else {
-            return create7BitString("class variable", UTF8Encoding.INSTANCE);
+            return coreStrings().CLASS_VARIABLE.createInstance();
         }
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/ReadInstanceVariableNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/ReadInstanceVariableNode.java
@@ -63,7 +63,7 @@ public Object isDefined(VirtualFrame frame) {
             if (readOrNullNode.execute((DynamicObject) receiverObject) == null) {
                 return nil();
             } else {
-                return create7BitString("instance-variable", UTF8Encoding.INSTANCE);
+                return coreStrings().INSTANCE_VARIABLE.createInstance();
             }
         } else {
             return false;

diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/SelfNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/SelfNode.java
@@ -32,7 +32,7 @@ public Object execute(VirtualFrame frame) {
 
     @Override
     public Object isDefined(VirtualFrame frame) {
-        return create7BitString("self", UTF8Encoding.INSTANCE);
+        return coreStrings().SELF.createInstance();
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/WriteClassVariableNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/WriteClassVariableNode.java
@@ -48,7 +48,7 @@ public Object execute(VirtualFrame frame) {
 
     @Override
     public Object isDefined(VirtualFrame frame) {
-        return create7BitString("assignment", UTF8Encoding.INSTANCE);
+        return coreStrings().ASSIGNMENT.createInstance();
     }
 
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/language/objects/WriteInstanceVariableNode.java b/truffle/src/main/java/org/jruby/truffle/language/objects/WriteInstanceVariableNode.java
@@ -59,7 +59,7 @@ public Object execute(VirtualFrame frame) {
 
     @Override
     public Object isDefined(VirtualFrame frame) {
-        return create7BitString("assignment", UTF8Encoding.INSTANCE);
+        return coreStrings().ASSIGNMENT.createInstance();
     }
 
 }