From 28aae9326b14489a7a643f5281455e10ca49211d Mon Sep 17 00:00:00 2001 From: Rudy Ges Date: Thu, 31 Aug 2023 14:25:57 +0200 Subject: [PATCH 1/2] local statics: handle abstract casts before --- src/typing/macroContext.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/typing/macroContext.ml b/src/typing/macroContext.ml index bedfdc710fa..f329acce66a 100644 --- a/src/typing/macroContext.ml +++ b/src/typing/macroContext.ml @@ -608,8 +608,8 @@ and flush_macro_context mint mctx = mctx.com.Common.modules <- modules; (* we should maybe ensure that all filters in Main are applied. Not urgent atm *) let expr_filters = [ - "local_statics",Filters.LocalStatic.run mctx; "handle_abstract_casts",AbstractCast.handle_abstract_casts mctx; + "local_statics",Filters.LocalStatic.run mctx; "Exceptions",Exceptions.filter mctx; "captured_vars",CapturedVars.captured_vars mctx.com; ] in From 910fe95237854cf5734cad2eea6cc051ccd71dcb Mon Sep 17 00:00:00 2001 From: Rudy Ges Date: Thu, 31 Aug 2023 14:43:53 +0200 Subject: [PATCH 2/2] [tests] add test for #11193 --- tests/misc/projects/Issue11193/Macro.hx | 6 ++++++ tests/misc/projects/Issue11193/compile.hxml | 1 + 2 files changed, 7 insertions(+) create mode 100644 tests/misc/projects/Issue11193/Macro.hx create mode 100644 tests/misc/projects/Issue11193/compile.hxml diff --git a/tests/misc/projects/Issue11193/Macro.hx b/tests/misc/projects/Issue11193/Macro.hx new file mode 100644 index 00000000000..d2ed9e0f66c --- /dev/null +++ b/tests/misc/projects/Issue11193/Macro.hx @@ -0,0 +1,6 @@ +class Macro { + static function test() { + static var m:Map = []; + trace(m); + } +} diff --git a/tests/misc/projects/Issue11193/compile.hxml b/tests/misc/projects/Issue11193/compile.hxml new file mode 100644 index 00000000000..660593079f7 --- /dev/null +++ b/tests/misc/projects/Issue11193/compile.hxml @@ -0,0 +1 @@ +--macro Macro.test()