[GR-17457] Remove extra methods Exception#{backtrace?, location, set_context}

PullRequest: truffleruby/2375

Author: bjfish

spec/tags/truffle/methods_tags.txt

@@ -35,9 +35,6 @@ fails:Public methods on Digest::Instance should not include finish
 fails:Public methods on Digest::Instance should not include to_str
 fails:Public methods on Digest::Instance should include block_length
 fails:Public methods on Dir should not include closed?
-fails:Public methods on Exception should not include backtrace?
-fails:Public methods on Exception should not include location
-fails:Public methods on Exception should not include set_context
 fails:Public methods on Exception should include respond_to?
 fails:Public methods on FalseClass should include ===
 fails:Public methods on TrueClass should include ===

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

@@ -65,15 +65,6 @@ def to_s
   # #initialize again, BUT not a subclasses initialize.
   alias_method :__initialize__, :initialize
 
-  def backtrace?
-    result = Primitive.exception_backtrace? self
-    if !Primitive.undefined?(result)
-      result
-    else
-      backtrace ? true : false
-    end
-  end
-
   def set_backtrace(bt)
     case bt
     when Array
@@ -91,14 +82,6 @@ def set_backtrace(bt)
     end
   end
 
-  def set_context(ctx)
-    if ctx.kind_of? Exception
-      @parent = ctx
-    else
-      set_backtrace(ctx)
-    end
-  end
-
   def inspect
     s = self.to_s
     if s.empty?
@@ -170,10 +153,6 @@ def exception(message=nil)
     self
   end
 
-  def location
-    [context.file.to_s, context.line]
-  end
-
   def self.to_tty?
     # Whether $stderr refers to the original STDERR and STDERR is a tty.
     # When using polyglot stdio, we cannot know and assume false.

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

@@ -688,8 +688,8 @@ def raise(exc = undefined, msg = undefined, ctx = nil)
     else
       exc = Truffle::ExceptionOperations.build_exception_for_raise(exc, msg)
 
-      exc.set_context ctx if ctx
-      Primitive.exception_capture_backtrace(exc, 1) unless exc.backtrace?
+      exc.set_backtrace(ctx) if ctx
+      Primitive.exception_capture_backtrace(exc, 1) unless Truffle::ExceptionOperations.backtrace?(exc)
       Primitive.exception_set_cause exc, last unless Primitive.object_equal(exc, last)
     end
 

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

@@ -183,8 +183,8 @@ def raise(exc = undefined, msg = undefined, ctx = nil)
 
     exc = Truffle::ExceptionOperations.build_exception_for_raise(exc, msg)
 
-    exc.set_context ctx if ctx
-    Primitive.exception_capture_backtrace(exc, 1) unless exc.backtrace?
+    exc.set_backtrace(ctx) if ctx
+    Primitive.exception_capture_backtrace(exc, 1) unless Truffle::ExceptionOperations.backtrace?(exc)
 
     Truffle::ExceptionOperations.show_exception_for_debug(exc, 1) if $DEBUG
 

src/main/ruby/truffleruby/core/truffle/exception_operations.rb

@@ -123,6 +123,15 @@ def self.backtrace_message(highlight, reverse, bt, exc)
       end
     end
 
+    def self.backtrace?(exc)
+      result = Primitive.exception_backtrace? exc
+      if Primitive.undefined?(result)
+        exc.backtrace ? true : false
+      else
+        result
+      end
+    end
+
     def self.append_causes(str, err, causes, reverse, highlight)
       if !Primitive.nil?(err.cause) && Exception === err.cause && !causes.has_key?(err.cause)
         causes[err.cause] = true