Commit b4a3d847 authored by Christoph Mallon's avatar Christoph Mallon
Browse files

Indentation.

[r22302]
parent c71681c2
...@@ -1148,54 +1148,48 @@ static unsigned optimize_load(ir_node *load) ...@@ -1148,54 +1148,48 @@ static unsigned optimize_load(ir_node *load)
value = NULL; value = NULL;
/* check if we can determine the entity that will be loaded */ /* check if we can determine the entity that will be loaded */
ent = find_constant_entity(ptr); ent = find_constant_entity(ptr);
if (ent != NULL) { if (ent != NULL &&
if ((allocation_static == get_entity_allocation(ent)) && allocation_static == get_entity_allocation(ent) &&
(visibility_external_allocated != get_entity_visibility(ent))) { visibility_external_allocated != get_entity_visibility(ent)) {
/* a static allocation that is not external: there should be NO exception /* a static allocation that is not external: there should be NO exception
* when loading even if we cannot replace the load itself. */ * when loading even if we cannot replace the load itself. */
/* no exception, clear the info field as it might be checked later again */ /* no exception, clear the info field as it might be checked later again */
if (info->projs[pn_Load_X_except]) { if (info->projs[pn_Load_X_except]) {
exchange(info->projs[pn_Load_X_except], new_Bad()); exchange(info->projs[pn_Load_X_except], new_Bad());
info->projs[pn_Load_X_except] = NULL; info->projs[pn_Load_X_except] = NULL;
res |= CF_CHANGED; res |= CF_CHANGED;
} }
if (info->projs[pn_Load_X_regular]) { if (info->projs[pn_Load_X_regular]) {
exchange(info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load))); exchange(info->projs[pn_Load_X_regular], new_r_Jmp(current_ir_graph, get_nodes_block(load)));
info->projs[pn_Load_X_regular] = NULL; info->projs[pn_Load_X_regular] = NULL;
res |= CF_CHANGED; res |= CF_CHANGED;
} }
if (variability_constant == get_entity_variability(ent)) { if (variability_constant == get_entity_variability(ent)) {
if (is_atomic_entity(ent)) { if (is_atomic_entity(ent)) {
/* Might not be atomic after /* Might not be atomic after lowering of Sels. In this case we
lowering of Sels. In this * could also load, but it's more complicated. */
case we could also load, but /* more simpler case: we load the content of a constant value:
it's more complicated. */ * replace it by the constant itself */
/* more simpler case: we load the content of a constant value: value = get_atomic_ent_value(ent);
* replace it by the constant itself } else if (ent->has_initializer) {
*/ /* new style initializer */
value = get_atomic_ent_value(ent); value = find_compound_ent_value(ptr);
} else { } else {
if (ent->has_initializer) { /* old style initializer */
/* new style initializer */ compound_graph_path *path = get_accessed_path(ptr);
value = find_compound_ent_value(ptr);
} else { if (path != NULL) {
/* old style initializer */ assert(is_proper_compound_graph_path(path, get_compound_graph_path_length(path)-1));
compound_graph_path *path = get_accessed_path(ptr);
value = get_compound_ent_value_by_path(ent, path);
if (path != NULL) { DB((dbg, LEVEL_1, " Constant access at %F%F resulted in %+F\n", ent, path, value));
assert(is_proper_compound_graph_path(path, get_compound_graph_path_length(path)-1)); free_compound_graph_path(path);
value = get_compound_ent_value_by_path(ent, path);
DB((dbg, LEVEL_1, " Constant access at %F%F resulted in %+F\n", ent, path, value));
free_compound_graph_path(path);
}
}
} }
if (value != NULL)
value = can_replace_load_by_const(load, value);
} }
if (value != NULL)
value = can_replace_load_by_const(load, value);
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment