From be04820c070d01d7565b936fa14efc2941055e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 16 Feb 2011 06:54:15 +0100
Subject: emulator: Add a fourth element in exception stacktraces

This commit is a preparation for introducing location information
(filename/line number) in stacktraces in exceptions. Currently
a stack trace looks like:

  [{Mod1,Function1,Arity1},
   .
   .
   .
   {ModN,FunctionN,ArityN}]

Add a forth element to each tuple that can be used indication
the filename and line number of the source file:

  [{Mod1,Function1,Arity1,Location1},
   .
   .
   .
   {ModN,FunctionN,ArityN,LocationN}]

In this commit, the fourth element will just be an empty list,
and we will change all code that look at or manipulate stacktraces.
---
 lib/kernel/src/error_handler.erl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/kernel/src')

diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index e1f99bf417..a67b11a888 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -88,12 +88,12 @@ int() -> int.
 -spec crash(atom(), [term()]) -> no_return().
 
 crash(Fun, Args) ->
-    crash({Fun,Args}).
+    crash({Fun,Args,[]}).
 
 -spec crash(atom(), atom(), arity()) -> no_return().
 
 crash(M, F, A) ->
-    crash({M,F,A}).
+    crash({M,F,A,[]}).
 
 -spec crash(tuple()) -> no_return().
 
@@ -101,7 +101,8 @@ crash(Tuple) ->
     try erlang:error(undef)
     catch
 	error:undef ->
-	    erlang:raise(error, undef, [Tuple|tl(erlang:get_stacktrace())])
+	    Stk = [Tuple|tl(erlang:get_stacktrace())],
+	    erlang:raise(error, undef, Stk)
     end.
 
 %% If the code_server has not been started yet dynamic code loading
@@ -127,7 +128,7 @@ ensure_loaded(Module) ->
 -spec stub_function(atom(), atom(), [_]) -> no_return().
 
 stub_function(Mod, Func, Args) ->
-    exit({undef,[{Mod,Func,Args}]}).
+    exit({undef,[{Mod,Func,Args,[]}]}).
 
 check_inheritance(Module, Args) ->
     Attrs = erlang:get_module_info(Module, attributes),
-- 
cgit v1.2.3


From 053fb064496043207cfa807c900077f9bbc4c7d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 21 Feb 2011 16:53:34 +0100
Subject: compiler: Don't create filenames starting with "./"

In the location information tables in the run-time system, source
filenames that are the same as the module name plus ".erl" extension
are not stored explicitly, thus saving memory.

To take advantage of that optimization, avoid complicating the names of
files in the current working directory; specifically, make sure that
"./" is not prepended to the name.
---
 lib/kernel/src/file.erl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/kernel/src')

diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 5e4e1b0ba8..706c60caaf 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -1163,7 +1163,7 @@ path_open_first([Path|Rest], Name, Mode, LastError) ->
 	{error, _} = Error ->
 	    Error;
 	FilePath ->
-	    FileName = filename:join(FilePath, Name),
+	    FileName = fname_join(FilePath, Name),
 	    case open(FileName, Mode) of
 		{ok, Fd} ->
 		    {ok, Fd, FileName};
@@ -1176,6 +1176,11 @@ path_open_first([Path|Rest], Name, Mode, LastError) ->
 path_open_first([], _Name, _Mode, LastError) ->
     {error, LastError}.
 
+fname_join(".", Name) ->
+    Name;
+fname_join(Dir, Name) ->
+    filename:join(Dir, Name).
+
 %%%-----------------------------------------------------------------
 %%% Utility functions.
 
-- 
cgit v1.2.3