[GR-17457] Remove ImmediateValue

PullRequest: truffleruby/2482

Author: bjfish

lib/truffle/truffle/cext_structs.rb

@@ -23,7 +23,7 @@ def RDATA(object)
   end
 
   def RBASIC(object)
-    if ImmediateValue === object
+    if Primitive.immediate_value?(object)
       raise TypeError, "immediate values don't include the RBasic struct"
     end
     RBasic.new(object)

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -1013,7 +1013,6 @@ public boolean isTruffleBootMainMethod(SharedMethodInfo info) {
             "/core/splitter.rb",
             "/core/stat.rb",
             "/core/io.rb",
-            "/core/immediate.rb",
             "/core/proc.rb",
             "/core/enumerable_helper.rb",
             "/core/enumerable.rb",

src/main/java/org/truffleruby/core/support/TypeNodes.java

@@ -38,6 +38,7 @@
 import org.truffleruby.core.string.StringNodes;
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.core.symbol.RubySymbol;
+import org.truffleruby.language.Nil;
 import org.truffleruby.language.NotProvided;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyNode;
@@ -122,6 +123,46 @@ protected boolean objectEqual(Object a, Object b,
 
     }
 
+    @Primitive(name = "immediate_value?")
+    public static abstract class IsImmediateValueNode extends PrimitiveArrayArgumentsNode {
+
+        @Specialization
+        protected boolean doBoolean(boolean value) {
+            return true;
+        }
+
+        @Specialization
+        protected boolean doInt(int value) {
+            return true;
+        }
+
+        @Specialization
+        protected boolean doLong(long value) {
+            return true;
+        }
+
+        @Specialization
+        protected boolean doFloat(double value) {
+            return true;
+        }
+
+        @Specialization
+        protected boolean doSymbol(RubySymbol value) {
+            return true;
+        }
+
+        @Specialization
+        protected boolean doNil(Nil value) {
+            return true;
+        }
+
+        @Fallback
+        protected boolean doFallback(Object value) {
+            return false;
+        }
+
+    }
+
     @Primitive(name = "nil?")
     public static abstract class IsNilNode extends PrimitiveArrayArgumentsNode {
 

src/main/ruby/truffleruby/core/false.rb

@@ -39,6 +39,14 @@ def inspect
   end
 
   alias_method :===, :===
+
+  class << self
+    undef_method :new
+  end
+
+  def self.__allocate__
+    raise TypeError, "allocator undefined for #{self}"
+  end
 end
 
 FALSE = false

src/main/ruby/truffleruby/core/float.rb

@@ -260,4 +260,12 @@ def coerce(other)
   def finite?
     not (nan? or infinite?)
   end
+
+  class << self
+    undef_method :new
+  end
+
+  def self.__allocate__
+    raise TypeError, "allocator undefined for #{self}"
+  end
 end

src/main/ruby/truffleruby/core/immediate.rb

@@ -354,4 +354,12 @@ def self.sqrt(n)
     end
     self
   end
+
+  class << self
+    undef_method :new
+  end
+
+  def self.__allocate__
+    raise TypeError, "allocator undefined for #{self}"
+  end
 end

src/main/ruby/truffleruby/core/integer.rb

@@ -542,7 +542,7 @@ def const_lookup(name, type = nil)
     end
 
     def add_non_immediate_object(obj)
-      return if Primitive.object_kind_of? obj, ImmediateValue
+      return if Primitive.immediate_value?(obj)
       add_object(obj)
     end
 

src/main/ruby/truffleruby/core/marshal.rb

@@ -78,6 +78,14 @@ def to_h
   end
 
   alias_method :===, :===
+
+  class << self
+    undef_method :new
+  end
+
+  def self.__allocate__
+    raise TypeError, "allocator undefined for #{self}"
+  end
 end
 
 NIL = nil

src/main/ruby/truffleruby/core/nil.rb

@@ -159,6 +159,14 @@ def [](index, other = undefined)
 
   # Use equal? for ===
   alias_method :===, :equal?
+
+  class << self
+    undef_method :new
+  end
+
+  def self.__allocate__
+    raise TypeError, "allocator undefined for #{self}"
+  end
 end
 
 module Truffle::SymbolOperations