Merge branch 'bjorn/compiler/clean-up/OTP-12497'

* bjorn/compiler/clean-up/OTP-12497:
  cerl: Teach is_literal_term/1 to handle maps
  cerl: Add missing is_c_map/1 function
  v3_core: Simplify translation of maps
  sys_core_fold: Simplify opt_simple_let_2/6
  Break out inlining of 'lists' functions to a new module
  sys_core_fold: Add is_int_type/2 and is_tuple_type/2
  sys_core_fold: Refactor type information access
  core_lib: Deprecate functions that are no longer used by the compiler
  Eliminate use of core_lib:literal_value/1
  Eliminate all uses of core_lib:get_anno/1 and core_lib:set_anno/2
  core_lint: Eliminate call to core_lib:is_literal/1
  test_lib: Include test_server.hrl using -include_lib
  sys_core_fold: Rename add_scope/2 to fit in the sub_* family
  v3_core: Suppress compiler-generated calls in guards
  v3_core: Remove out-commented code
  v3_core: Remove unused function argument for bc_tq()
  v3_core: Use Core Erlang annotations in a type-safe way

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/compiler/src/sys_core_inline.erl b/lib/compiler/src/sys_core_inline.erl
index 9f93acb666..1e3a735e9b 100644
--- a/lib/compiler/src/sys_core_inline.erl
+++ b/lib/compiler/src/sys_core_inline.erl
@@ -195,10 +195,10 @@ kill_id_anns(Body) ->
 			   A = kill_id_anns_1(A0),
 			   CFun#c_fun{anno=A};
 		      (Expr) ->
-			   %% Mark everything as compiler generated to suppress
-			   %% bogus warnings.
-			   A = compiler_generated(core_lib:get_anno(Expr)),
-			   core_lib:set_anno(Expr, A)
+			   %% Mark everything as compiler generated to
+			   %% suppress bogus warnings.
+			   A = compiler_generated(cerl:get_ann(Expr)),
+			   cerl:set_ann(Expr, A)
 		   end, Body).
 
 kill_id_anns_1([{'id',_}|As]) ->