13 files changed, 37 insertions, 6 deletions

diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index a85f5598b6..001c9c76ed 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index cf3effc1e5..c5cf4b459f 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index 7dc7407a81..b467633a4d 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 5c139c4550..915a2d1aef 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
diff --git a/erts/preloaded/ebin/otp_ring0.beam b/erts/preloaded/ebin/otp_ring0.beam
index cf32b79e8d..df1bf932a3 100644
--- a/erts/preloaded/ebin/otp_ring0.beam
+++ b/erts/preloaded/ebin/otp_ring0.beam
diff --git a/erts/preloaded/ebin/prim_eval.beam b/erts/preloaded/ebin/prim_eval.beam
index 37ed8d0365..95b4bbca2d 100644
--- a/erts/preloaded/ebin/prim_eval.beam
+++ b/erts/preloaded/ebin/prim_eval.beam
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index d49578abfa..5e4fc5ba84 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
index 8420052533..9d9a4886d9 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
diff --git a/erts/preloaded/ebin/prim_zip.beam b/erts/preloaded/ebin/prim_zip.beam
index 8dc8cb961b..d98b0275f4 100644
--- a/erts/preloaded/ebin/prim_zip.beam
+++ b/erts/preloaded/ebin/prim_zip.beam
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
index 7507efb076..0744bdb21d 100644
--- a/erts/preloaded/ebin/zlib.beam
+++ b/erts/preloaded/ebin/zlib.beam
diff --git a/lib/common_test/src/ct_property_test.erl b/lib/common_test/src/ct_property_test.erl
index 39d089f04c..52acda5388 100644
--- a/lib/common_test/src/ct_property_test.erl
+++ b/lib/common_test/src/ct_property_test.erl
@@ -59,8 +59,10 @@
 %%% '''
 %%%
 %%% <warning>
+%%% <p>
 %%% This is experimental code which may be changed or removed
-%%% anytime without any warning.  
+%%% anytime without any warning.
+%%% </p>
 %%% </warning>
 %%%
 %%% @end
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index d89e1dfd26..b3cd53c497 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -114,6 +114,9 @@ first.</p>
 	    M-bit, resulting in 5001) failed if the AVP contained a
 	    complete header.</p>
           <p>
+	    Dictionary files must be recompiled for the fix to have
+	    effect.</p>
+          <p>
 	    Own Id: OTP-11946</p>
         </item>
         <item>
@@ -152,6 +155,9 @@ first.</p>
 	    otherwise not. AVPs of type Grouped are decoded as much
 	    as possible, as deeply as possible.</p>
           <p>
+	    Dictionary files must be recompiled for the fix to have
+	    effect.</p>
+          <p>
 	    Own Id: OTP-11936 Aux Id: OTP-11007 </p>
         </item>
         <item>
diff --git a/lib/diameter/src/compiler/diameter_codegen.erl b/lib/diameter/src/compiler/diameter_codegen.erl
index 5a068c1a25..d91a776321 100644
--- a/lib/diameter/src/compiler/diameter_codegen.erl
+++ b/lib/diameter/src/compiler/diameter_codegen.erl
@@ -132,7 +132,7 @@ gen(parse, ParseD, _Mod) ->
     [?VERSION | ParseD];
 
 gen(forms, ParseD, Mod) ->
-    pp(erl_forms(Mod, ParseD));
+    preprocess(Mod, erl_forms(Mod, ParseD));
 
 gen(hrl, ParseD, Mod) ->
     gen_hrl(Mod, ParseD);
@@ -838,19 +838,19 @@ rec_name(Name, Prefix) ->
     Prefix ++ Name.
 
 %% ===========================================================================
-%% pp/1
+%% preprocess/2
 %%
 %% Preprocess forms as generated by 'forms' option. In particular,
 %% replace the include_lib attributes in generated forms by the
 %% corresponding forms, extracting the latter from an existing
 %% dictionary (diameter_gen_relay). The resulting forms can be
 %% compiled to beam using compile:forms/2 (which does no preprocessing
-%% or it's own; DiY currently appears to be the only way to preprocess
+%% of it's own; DiY currently appears to be the only way to preprocess
 %% a forms list).
 
-pp(Forms) ->
+preprocess(Mod, Forms) ->
     {_, Beam, _} = code:get_object_code(diameter_gen_relay),
-    pp(Forms, abstract_code(Beam)).
+    pp(Forms, remod(Mod, abstract_code(Beam))).
 
 pp(Forms, {ok, Code}) ->
     Files = files(Code, []),
@@ -859,6 +859,25 @@ pp(Forms, {ok, Code}) ->
 pp(Forms, {error, Reason}) ->
     erlang:error({forms, Reason, Forms}).
 
+%% Replace literal diameter_gen_relay atoms in the extracted forms.
+%% ?MODULE for example.
+
+remod(Mod, L)
+  when is_list(L) ->
+    [remod(Mod, T) || T <- L];
+
+remod(Mod, {atom, _, diameter_gen_relay} = T) ->
+    setelement(3, T, Mod);
+
+remod(Mod, T)
+  when is_tuple(T) ->
+    list_to_tuple(remod(Mod, tuple_to_list(T)));
+
+remod(_, T) ->
+    T.
+
+%% Replace include_lib by the corresponding forms.
+
 include({attribute, _, include_lib, Path}, Files) ->
     Inc = filename:basename(Path),
     [{Inc, Forms}] = [T || {F, _} = T <- Files, F == Inc], %% expect one
@@ -867,6 +886,8 @@ include({attribute, _, include_lib, Path}, Files) ->
 include(T, _) ->
     [T].
 
+%% Extract abstract code.
+
 abstract_code(Beam) ->
     case beam_lib:chunks(Beam, [abstract_code]) of
         {ok, {_Mod, [{abstract_code, {_Vsn, Code}}]}} ->
@@ -877,6 +898,8 @@ abstract_code(Beam) ->
             {E, Reason}
     end.
 
+%% Extract filename/forms pairs for included forms.
+
 files([{attribute, _, file, {Path, _}} | T], Acc) ->
     {Body, Rest} = lists:splitwith(fun({attribute, _, file, _}) -> false;
                                       (_) -> true