Merge branch 'hasse/fix_erl_anno_use'

* hasse/fix_erl_anno_use:
  parsetools: Fix handling of locations and annotations
  diameter: Fix handling of locations and annotations
  kernel: Fix handling of locations and annotations
  compiler: Fix handling of locations and annotations
  eunit: Fix handling of locations and annotations
  Update preloaded
  erts: Fix handling of locations and annotations
  dialyzer: Fix handling of annotations in a test
  debugger: Fix handling of locations and annotations
  stdlib: Extend functions in erl_parse to handle form_info()
  stdlib: Fix handling of locations and annotations
  erts: Correct the documentation of abstract end-of-file
  stdlib: Add debug tests to the erl_parse module
  stdlib: improve the erl_anno module's debug tests
  stdlib: Improve the  erl_pp module's debug tests

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index c7dcd9ae16..df38edf393 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -2549,7 +2549,7 @@ otp_5878(Config) when is_list(Config) ->
                    {function,9,t,0,[{clause,9,[],[],[{record,10,r,[]}]}]},
                    {eof,11}],
     {error,[{"rec.erl",[{7,erl_lint,old_abstract_code}]}],[]} =
-        compile:forms(OldAbstract, [return, report]),
+        compile_forms(OldAbstract, [return, report]),
 
     ok.
 
@@ -3848,9 +3848,13 @@ otp_11879(_Config) ->
              [{1,erl_lint,{spec_fun_undefined,{f,1}}},
               {2,erl_lint,spec_wrong_arity},
               {22,erl_lint,callback_wrong_arity}]}],
-     []} = compile:forms(Fs, [return,report]),
+     []} = compile_forms(Fs, [return,report]),
     ok.
 
+compile_forms(Terms, Opts) ->
+    Forms = [erl_parse:anno_from_term(Term) || Term <- Terms],
+    compile:forms(Forms, Opts).
+
 %% OTP-13230: -deprecated without -module.
 otp_13230(Config) when is_list(Config) ->
     Abstr = <<"-deprecated([{frutt,0,next_version}]).">>,