From a8c56c1f25d786fc5bfb35ff27f8e0e96b71f9ed Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 12 Jul 2024 10:00:13 -0700 Subject: [PATCH] Fix a broken merge I merged an old version of the branch on accident and then merged the right one over top of it, but git ended up including both versions. This fixes that mistake. (cherry picked from commit f3bcf1a55d13986ef7d6146ca26095de32c0176b) --- src/spicy/spicyz/driver.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/spicy/spicyz/driver.cc b/src/spicy/spicyz/driver.cc index 82759fbf5e..75ffd1f6fa 100644 --- a/src/spicy/spicyz/driver.cc +++ b/src/spicy/spicyz/driver.cc @@ -35,15 +35,11 @@ struct VisitorTypes : public spicy::visitor::PreOrder { : driver(driver), glue(glue), is_resolved(is_resolved) {} void operator()(hilti::declaration::Module* n) final { - // Ignore modules built by us in memory, or builtin modules which - // never contain implementations of hooks for user types. - if ( n->uid().in_memory || - (module == "hilti" || module == "spicy" || module == "spicy_rt" || module == "zeek_rt") ) { + if ( n->uid().in_memory ) { + // Ignore modules built by us in memory. module = {}; return; } - - module = n->scopeID(); path = n->uid().path;