Set Exception's callstack when raising it, not when creating it

crystal-lang · May 30, 2016 · b3943d5 · b3943d5
1 parent 66f4312
commit b3943d5
Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/exception.cr b/src/exception.cr
@@ -143,15 +143,17 @@ end
 class Exception
   getter message : String?
   getter cause : Exception?
+  property callstack : CallStack?
 
-  def initialize(message : String? = nil, cause : Exception? = nil)
-    @message = message
-    @cause = cause
-    @callstack = CallStack.new
+  def initialize(@message : String? = nil, @cause : Exception? = nil)
   end
 
   def backtrace
-    @callstack.printable_backtrace
+    self.backtrace?.not_nil!
+  end
+
+  def backtrace?
+    @callstack.try &.printable_backtrace
   end
 
   def to_s(io : IO)
@@ -166,7 +168,7 @@ class Exception
 
   def inspect_with_backtrace(io : IO)
     io << @message << " (" << self.class << ")\n"
-    backtrace.each do |frame|
+    backtrace.try &.each do |frame|
       io.puts frame
     end
     io.flush

diff --git a/src/raise.cr b/src/raise.cr
@@ -96,6 +96,7 @@ fun __crystal_get_exception(unwind_ex : LibUnwind::Exception*) : UInt64
 end
 
 def raise(ex : Exception) : NoReturn
+  ex.callstack = CallStack.new
   unwind_ex = Pointer(LibUnwind::Exception).malloc
   unwind_ex.value.exception_class = LibC::SizeT.zero
   unwind_ex.value.exception_cleanup = LibC::SizeT.zero