--- analysis.hlds_dump.055-unique_modes 2008-02-28 16:10:47.000000000 +1100 +++ analysis.hlds_dump.065-frontend_simplify 2008-02-28 16:10:47.000000000 +1100 @@ -73,7 +73,7 @@ % V_76 (number 76): (tree234.tree234(string, (analysis.analysis_status))) % V_77 (number 77): (tree234.tree234(string, (tree234.tree234(string, (tree234.tree234(string, (list.list((analysis.analysis_request))))))))) % V_78 (number 78): (set.set(string)) -% V_79 (number 79): Compiler_4 +% V_79 (number 79): Compiler_5 % V_80 (number 80): (tree234.tree234(string, (tree234.tree234(string, (tree234.tree234(string, (list.list((analysis.imdg_arc))))))))) % V_81 (number 81): (tree234.tree234(string, (tree234.tree234(string, (tree234.tree234(string, (list.list((analysis.imdg_arc))))))))) % V_82 (number 82): (tree234.tree234(string, (tree234.tree234(string, (tree234.tree234(string, (list.list((analysis.imdg_arc))))))))) @@ -160,14 +160,12 @@ % Compiler_1 (number 1) -> typeclass_info(TypeClassInfo_for_compiler_106, 1) (number 106) % Compiler_2 (number 2) -> typeclass_info(TypeClassInfo_for_compiler_117, 1) (number 117) % Compiler_3 (number 3) -> typeclass_info(TypeClassInfo_for_compiler_138, 1) (number 138) -% Compiler_4 (number 4) -> typeclass_info(TypeClassInfo_for_compiler_149, 1) (number 149) % Compiler_5 (number 5) -> typeclass_info(TypeClassInfo_for_compiler_160, 1) (number 160) % Compiler_6 (number 6) -> typeclass_info(TypeClassInfo_for_compiler_161, 1) (number 161) % typeclass_info varmap: % analysis.compiler(Compiler_1) -> TypeClassInfo_for_compiler_106 % analysis.compiler(Compiler_2) -> TypeClassInfo_for_compiler_117 % analysis.compiler(Compiler_3) -> TypeClassInfo_for_compiler_138 -% analysis.compiler(Compiler_4) -> TypeClassInfo_for_compiler_149 % analysis.compiler(Compiler_5) -> TypeClassInfo_for_compiler_160 % analysis.compiler(Compiler_6) -> TypeClassInfo_for_compiler_161 % rtti_var_info: @@ -188,7 +186,7 @@ % TypeClassInfo_for_compiler_106 (number 106) -> typeclass_info for analysis.compiler(Compiler_1) % TypeClassInfo_for_compiler_117 (number 117) -> typeclass_info for analysis.compiler(Compiler_2) % TypeClassInfo_for_compiler_138 (number 138) -> typeclass_info for analysis.compiler(Compiler_3) -% TypeClassInfo_for_compiler_149 (number 149) -> typeclass_info for analysis.compiler(Compiler_4) +% TypeClassInfo_for_compiler_149 (number 149) -> typeclass_info for analysis.compiler(Compiler_5) % TypeClassInfo_for_compiler_160 (number 160) -> typeclass_info for analysis.compiler(Compiler_5) % TypeClassInfo_for_compiler_161 (number 161) -> typeclass_info for analysis.compiler(Compiler_6) % address is not taken @@ -211,8 +209,6 @@ % nonlocals: ModuleId_5, ImportedModuleId_6, V_18 V_18 = (pred(V_22::(unique >> clobbered), V_21::(free >> unique)) is det :- % nonlocals: ModuleId_5, ImportedModuleId_6, V_21, V_22 - some [] ( - % nonlocals: ModuleId_5, ImportedModuleId_6, V_21, V_22 ( % conjunction % nonlocals: V_22, STATE_VARIABLE_IO_0_42 V_22 = STATE_VARIABLE_IO_0_42 @@ -262,7 +258,6 @@ % nonlocals: V_21, STATE_VARIABLE_IO_43 V_21 = STATE_VARIABLE_IO_43 ) - ) ) % lambda nonlocals: ModuleId_5, ImportedModuleId_6 , % nonlocals: STATE_VARIABLE_IO_1_16, V_18, STATE_VARIABLE_IO_2_44 @@ -312,9 +307,9 @@ % nonlocals: ModuleId_5, IMDG0_9, IMDG1_10 analysis.clear_imdg_entries_pointing_at(ModuleId_5, IMDG0_9, IMDG1_10) , - % nonlocals: ImportedModuleId_6, IMDG1_10, IMDG_12, STATE_VARIABLE_Info_0_13 + % nonlocals: ImportedModuleId_6, IMDG1_10, IMDG_12, STATE_VARIABLE_Info_0_13, TypeInfo_114_114, TypeInfo_116_116 (if - % nonlocals: ImportedModuleId_6, NewArcs_11, STATE_VARIABLE_Info_0_13 + % nonlocals: ImportedModuleId_6, NewArcs_11, STATE_VARIABLE_Info_0_13, TypeInfo_116_116 ( % conjunction % nonlocals: STATE_VARIABLE_Info_0_13, V_34 STATE_VARIABLE_Info_0_13 = analysis.analysis_info(TypeClassInfo_for_compiler_117, V_62, V_61, V_60, V_59, V_58, V_57, V_56, V_55, V_54, V_34) @@ -322,38 +317,14 @@ % nonlocals: TypeCtorInfo_118_118 TypeCtorInfo_118_118 = type_ctor_info("", "string", 0) , - % nonlocals: TypeCtorInfo_126_126 - TypeCtorInfo_126_126 = type_ctor_info("tree234", "tree234", 2) - , - % nonlocals: TypeCtorInfo_119_119 - TypeCtorInfo_119_119 = type_ctor_info("", "string", 0) - , - % nonlocals: TypeCtorInfo_124_124 - TypeCtorInfo_124_124 = type_ctor_info("tree234", "tree234", 2) - , - % nonlocals: TypeCtorInfo_120_120 - TypeCtorInfo_120_120 = type_ctor_info("", "string", 0) - , - % nonlocals: TypeCtorInfo_122_122 - TypeCtorInfo_122_122 = type_ctor_info("list", "list", 1) - , - % nonlocals: TypeCtorInfo_121_121 - TypeCtorInfo_121_121 = type_ctor_info("analysis", "imdg_arc", 0) - , - % nonlocals: TypeCtorInfo_121_121, TypeCtorInfo_122_122, TypeInfo_123_123 - TypeInfo_123_123 = type_info_cell_constructor(TypeCtorInfo_122_122, TypeCtorInfo_121_121) - , - % nonlocals: TypeCtorInfo_120_120, TypeInfo_123_123, TypeCtorInfo_124_124, TypeInfo_125_125 - TypeInfo_125_125 = type_info_cell_constructor(TypeCtorInfo_124_124, TypeCtorInfo_120_120, TypeInfo_123_123) - , - % nonlocals: TypeCtorInfo_119_119, TypeInfo_125_125, TypeCtorInfo_126_126, TypeInfo_127_127 - TypeInfo_127_127 = type_info_cell_constructor(TypeCtorInfo_126_126, TypeCtorInfo_119_119, TypeInfo_125_125) + % nonlocals: TypeInfo_116_116, TypeInfo_127_127 + TypeInfo_127_127 = TypeInfo_116_116 , % nonlocals: ImportedModuleId_6, NewArcs_11, V_34, TypeCtorInfo_118_118, TypeInfo_127_127 NewArcs_11 = map.elem(TypeCtorInfo_118_118, TypeInfo_127_127, ImportedModuleId_6, V_34) ) then - % nonlocals: IMDG1_10, NewArcs_11, IMDG_12 + % nonlocals: IMDG1_10, NewArcs_11, IMDG_12, TypeInfo_114_114 ( % conjunction % nonlocals: V_35 V_35 = (pred(V_128::(ground >> ground), V_129::(ground >> ground), V_130::(free >> ground)) is det :- @@ -361,23 +332,8 @@ analysis.combine_func_imdg(V_128, V_129, V_130) ) , - % nonlocals: TypeCtorInfo_135_135 - TypeCtorInfo_135_135 = type_ctor_info("tree234", "tree234", 2) - , - % nonlocals: TypeCtorInfo_131_131 - TypeCtorInfo_131_131 = type_ctor_info("", "string", 0) - , - % nonlocals: TypeCtorInfo_133_133 - TypeCtorInfo_133_133 = type_ctor_info("list", "list", 1) - , - % nonlocals: TypeCtorInfo_132_132 - TypeCtorInfo_132_132 = type_ctor_info("analysis", "imdg_arc", 0) - , - % nonlocals: TypeCtorInfo_132_132, TypeCtorInfo_133_133, TypeInfo_134_134 - TypeInfo_134_134 = type_info_cell_constructor(TypeCtorInfo_133_133, TypeCtorInfo_132_132) - , - % nonlocals: TypeCtorInfo_131_131, TypeInfo_134_134, TypeCtorInfo_135_135, TypeInfo_136_136 - TypeInfo_136_136 = type_info_cell_constructor(TypeCtorInfo_135_135, TypeCtorInfo_131_131, TypeInfo_134_134) + % nonlocals: TypeInfo_114_114, TypeInfo_136_136 + TypeInfo_136_136 = TypeInfo_114_114 , % nonlocals: TypeCtorInfo_137_137 TypeCtorInfo_137_137 = type_ctor_info("", "string", 0) @@ -396,40 +352,16 @@ % nonlocals: TypeCtorInfo_139_139 TypeCtorInfo_139_139 = type_ctor_info("", "string", 0) , - % nonlocals: TypeCtorInfo_147_147 - TypeCtorInfo_147_147 = type_ctor_info("tree234", "tree234", 2) - , - % nonlocals: TypeCtorInfo_140_140 - TypeCtorInfo_140_140 = type_ctor_info("", "string", 0) - , - % nonlocals: TypeCtorInfo_145_145 - TypeCtorInfo_145_145 = type_ctor_info("tree234", "tree234", 2) - , - % nonlocals: TypeCtorInfo_141_141 - TypeCtorInfo_141_141 = type_ctor_info("", "string", 0) - , - % nonlocals: TypeCtorInfo_143_143 - TypeCtorInfo_143_143 = type_ctor_info("list", "list", 1) - , - % nonlocals: TypeCtorInfo_142_142 - TypeCtorInfo_142_142 = type_ctor_info("analysis", "imdg_arc", 0) - , - % nonlocals: TypeCtorInfo_142_142, TypeCtorInfo_143_143, TypeInfo_144_144 - TypeInfo_144_144 = type_info_cell_constructor(TypeCtorInfo_143_143, TypeCtorInfo_142_142) - , - % nonlocals: TypeCtorInfo_141_141, TypeInfo_144_144, TypeCtorInfo_145_145, TypeInfo_146_146 - TypeInfo_146_146 = type_info_cell_constructor(TypeCtorInfo_145_145, TypeCtorInfo_141_141, TypeInfo_144_144) - , - % nonlocals: TypeCtorInfo_140_140, TypeInfo_146_146, TypeCtorInfo_147_147, TypeInfo_148_148 - TypeInfo_148_148 = type_info_cell_constructor(TypeCtorInfo_147_147, TypeCtorInfo_140_140, TypeInfo_146_146) + % nonlocals: TypeInfo_116_116, TypeInfo_148_148 + TypeInfo_148_148 = TypeInfo_116_116 , % nonlocals: ImportedModuleId_6, IMDG_12, V_36, V_37, TypeCtorInfo_139_139, TypeInfo_148_148 V_37 = map.'elem :='(TypeCtorInfo_139_139, TypeInfo_148_148, ImportedModuleId_6, V_36, IMDG_12) , - % nonlocals: STATE_VARIABLE_Info_0_13, STATE_VARIABLE_Info_1_15, V_37 + % nonlocals: STATE_VARIABLE_Info_0_13, STATE_VARIABLE_Info_1_15, V_37, V_81 ( % barrier(removable) - % nonlocals: STATE_VARIABLE_Info_0_13, STATE_VARIABLE_Info_1_15, V_37 + % nonlocals: STATE_VARIABLE_Info_0_13, STATE_VARIABLE_Info_1_15, V_37, V_81 ( % conjunction % nonlocals: STATE_VARIABLE_Info_0_13, V_72, V_73, V_74, V_75, V_76, V_77, V_78, V_79, V_81, TypeClassInfo_for_compiler_149 STATE_VARIABLE_Info_0_13 = analysis.analysis_info(TypeClassInfo_for_compiler_149, V_79, V_78, V_77, V_76, V_75, V_74, V_73, V_72, V_80, V_81) @@ -442,35 +374,11 @@ % nonlocals: TypeCtorInfo_150_150 TypeCtorInfo_150_150 = type_ctor_info("", "string", 0) , - % nonlocals: TypeCtorInfo_158_158 - TypeCtorInfo_158_158 = type_ctor_info("tree234", "tree234", 2) - , - % nonlocals: TypeCtorInfo_151_151 - TypeCtorInfo_151_151 = type_ctor_info("", "string", 0) - , - % nonlocals: TypeCtorInfo_156_156 - TypeCtorInfo_156_156 = type_ctor_info("tree234", "tree234", 2) - , - % nonlocals: TypeCtorInfo_152_152 - TypeCtorInfo_152_152 = type_ctor_info("", "string", 0) - , - % nonlocals: TypeCtorInfo_154_154 - TypeCtorInfo_154_154 = type_ctor_info("list", "list", 1) - , - % nonlocals: TypeCtorInfo_153_153 - TypeCtorInfo_153_153 = type_ctor_info("analysis", "imdg_arc", 0) - , - % nonlocals: TypeCtorInfo_153_153, TypeCtorInfo_154_154, TypeInfo_155_155 - TypeInfo_155_155 = type_info_cell_constructor(TypeCtorInfo_154_154, TypeCtorInfo_153_153) - , - % nonlocals: TypeCtorInfo_152_152, TypeInfo_155_155, TypeCtorInfo_156_156, TypeInfo_157_157 - TypeInfo_157_157 = type_info_cell_constructor(TypeCtorInfo_156_156, TypeCtorInfo_152_152, TypeInfo_155_155) - , - % nonlocals: TypeCtorInfo_151_151, TypeInfo_157_157, TypeCtorInfo_158_158, TypeInfo_159_159 - TypeInfo_159_159 = type_info_cell_constructor(TypeCtorInfo_158_158, TypeCtorInfo_151_151, TypeInfo_157_157) + % nonlocals: TypeInfo_116_116, TypeInfo_159_159 + TypeInfo_159_159 = TypeInfo_116_116 , - % nonlocals: STATE_VARIABLE_Info_1_15, V_40 - STATE_VARIABLE_Info_1_15 = analysis.analysis_info(TypeClassInfo_for_compiler_160, V_90, V_89, V_88, V_87, V_86, V_85, V_84, V_83, V_82, V_40) + % nonlocals: V_40, V_81 + V_40 = V_81 , % nonlocals: ImportedModuleId_6, V_39, V_40, TypeCtorInfo_150_150, TypeInfo_159_159 V_39 = map.delete(TypeCtorInfo_150_150, TypeInfo_159_159, V_40, ImportedModuleId_6)