language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 15:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

storage subs for External specializations

Browse source
This commit is contained in:
Folkert 2021-11-19 17:10:30 +01:00
parent 206c8889df
commit e54344ac8b
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/mono/src/ir.rs
View file

@ -419,7 +419,7 @@ pub struct ExternalSpecializations<'a> {
/// Not a bumpalo vec because bumpalo is not thread safe /// Not a bumpalo vec because bumpalo is not thread safe
/// Separate array so we can search for membership quickly /// Separate array so we can search for membership quickly
symbols: std::vec::Vec<Symbol>, symbols: std::vec::Vec<Symbol>,
storage_subs: Subs, storage_subs: StorageSubs,
/// For each symbol, what types to specialize it for, points into the storage_subs /// For each symbol, what types to specialize it for, points into the storage_subs
types_to_specialize: std::vec::Vec<std::vec::Vec<Variable>>, types_to_specialize: std::vec::Vec<std::vec::Vec<Variable>>,
_lifetime: std::marker::PhantomData<&'a u8>, _lifetime: std::marker::PhantomData<&'a u8>,
@ -429,15 +429,14 @@ impl<'a> ExternalSpecializations<'a> {
pub fn new_in(_arena: &'a Bump) -> Self { pub fn new_in(_arena: &'a Bump) -> Self {
Self { Self {
symbols: std::vec::Vec::new(), symbols: std::vec::Vec::new(),
storage_subs: Subs::default(), storage_subs: StorageSubs::new(Subs::default()),
types_to_specialize: std::vec::Vec::new(), types_to_specialize: std::vec::Vec::new(),
_lifetime: std::marker::PhantomData, _lifetime: std::marker::PhantomData,
} }
} }
fn insert_external(&mut self, symbol: Symbol, env_subs: &mut Subs, variable: Variable) { fn insert_external(&mut self, symbol: Symbol, env_subs: &mut Subs, variable: Variable) {
let variable = let variable = self.storage_subs.extend_with_variable(env_subs, variable);
roc_types::subs::deep_copy_var_to(env_subs, &mut self.storage_subs, variable);
match self.symbols.iter().position(|s| *s == symbol) { match self.symbols.iter().position(|s| *s == symbol) {
None => { None => {
@ -454,7 +453,7 @@ impl<'a> ExternalSpecializations<'a> {
fn decompose( fn decompose(
self, self,
) -> ( ) -> (
Subs, StorageSubs,
impl Iterator<Item = (Symbol, std::vec::Vec<Variable>)>, impl Iterator<Item = (Symbol, std::vec::Vec<Variable>)>,
) { ) {
( (
@ -2051,9 +2050,13 @@ fn specialize_externals_others_need<'a>(
layout_cache: &mut LayoutCache<'a>, layout_cache: &mut LayoutCache<'a>,
) { ) {
for externals_others_need in all_externals_others_need { for externals_others_need in all_externals_others_need {
let (mut store, it) = externals_others_need.decompose(); let (store, it) = externals_others_need.decompose();
let offset_variable = StorageSubs::merge_into(store, env.subs);
for (symbol, solved_types) in it { for (symbol, solved_types) in it {
for store_variable in solved_types { for store_variable in solved_types {
let variable = offset_variable(store_variable);
// historical note: we used to deduplicate with a hash here, // historical note: we used to deduplicate with a hash here,
// but the cost of that hash is very high. So for now we make // but the cost of that hash is very high. So for now we make
// duplicate specializations, and the insertion into a hash map // duplicate specializations, and the insertion into a hash map
@ -2068,9 +2071,6 @@ fn specialize_externals_others_need<'a>(
} }
}; };
let variable =
roc_types::subs::deep_copy_var_to(&mut store, env.subs, store_variable);
// TODO I believe this is also duplicated // TODO I believe this is also duplicated
match specialize_variable( match specialize_variable(
env, env,