Merge branch 'hb/stdlib/epp_typed_record_fields/OTP-13148'

* hb/stdlib/epp_typed_record_fields/OTP-13148:
  stdlib: Update qlc_pt to handle typed record fields
  stdlib: Let the linter detect old typed records
  stdlib: Update the linter to handle typed record fields
  stdlib: Update erl_expand_records to handle typed record fields
  compiler: Update the compiler to handle typed record fields
  stdlib: Update erl_id_trans to handle types and specs
  stdlib: Add a Cover test with typed record field
  stdlib: Update module shell to handle typed record fields
  stdlib: Update ms_transform to handle typed record fields
  stdlib: Modify the preprocessor as to expose typed record fields

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 72f1a767ed..46917905de 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -1620,11 +1620,8 @@ output_encoding(F, #compile{encoding = Encoding}) ->
     ok = io:setopts(F, [{encoding, Encoding}]),
     ok = io:fwrite(F, <<"%% ~s\n">>, [epp:encoding_to_string(Encoding)]).
 
-restore_expanded_types("P", Fs) ->
-    epp:restore_typed_record_fields(Fs);
 restore_expanded_types("E", {M,I,Fs0}) ->
-    Fs1 = restore_expand_module(Fs0),
-    Fs = epp:restore_typed_record_fields(Fs1),
+    Fs = restore_expand_module(Fs0),
     {M,I,Fs};
 restore_expanded_types(_Ext, Code) -> Code.
 
@@ -1636,6 +1633,8 @@ restore_expand_module([{attribute,Line,spec,[Arg]}|Fs]) ->
     [{attribute,Line,spec,Arg}|restore_expand_module(Fs)];
 restore_expand_module([{attribute,Line,callback,[Arg]}|Fs]) ->
     [{attribute,Line,callback,Arg}|restore_expand_module(Fs)];
+restore_expand_module([{attribute,Line,record,[R]}|Fs]) ->
+    [{attribute,Line,record,R}|restore_expand_module(Fs)];
 restore_expand_module([F|Fs]) ->
     [F|restore_expand_module(Fs)];
 restore_expand_module([]) -> [].