akkartik/mu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2769 - fix build_and_test_until 043space.cc

Browse Source
This commit is contained in:
Kartik K. Agaram 2016-03-13 17:33:01 -07:00
parent 63f0b139af
commit c432e73af0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
033exclusive_container.cc
View File

@ -341,14 +341,14 @@ def main [
//: Since the different variants of an exclusive-container might have
//: different sizes, relax the size mismatch check for 'merge' instructions.
:(before "End size_mismatch(x) Cases")
if (current_instruction().operation == MERGE
if (current_step_index() < SIZE(Current_routine->steps())
&& current_instruction().operation == MERGE
&& !current_instruction().products.empty()
&& current_instruction().products.at(0).type) {
reagent x = current_instruction().products.at(0);
canonize(x);
if (get(Type, x.type->value).kind == EXCLUSIVE_CONTAINER) {
if (get(Type, x.type->value).kind == EXCLUSIVE_CONTAINER)
return size_of(x) < SIZE(data);
}
}
:(scenario merge_exclusive_container_with_mismatched_sizes)