mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-04 00:05:14 +00:00
Code Issues Releases Wiki Activity

Rework tests against Epsnodes to compare to the singleton

Browse Source 
Dynamic casts are slower than plain comparisons so rework epsnode comparison
to use comparisons to the singleton epsnode instead of dynamic_casts.
This commit is contained in:
John Johansen
2010-11-09 11:47:37 -08:00
parent 6801346b81
commit ac9553de19
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parser/libapparmor_re/regexp.y
View File

@@ -568,11 +568,10 @@ void normalize_tree(Node *t, int dir)
return; return;
for (;;) { for (;;) {
if (!dynamic_cast<EpsNode *>(t->child[!dir]) && if ((&epsnode == t->child[dir]) &&
((dynamic_cast<AltNode *>(t) && (&epsnode != t->child[!dir]) &&
dynamic_cast<EpsNode *>(t->child[dir])) || (dynamic_cast<AltNode *>(t) ||
(dynamic_cast<CatNode *>(t) && dynamic_cast<CatNode *>(t))) {
dynamic_cast<EpsNode *>(t->child[dir])))) {
// (E | a) -> (a | E) // (E | a) -> (a | E)
// Ea -> aE // Ea -> aE
Node *c = t->child[dir]; Node *c = t->child[dir];
@@ -740,7 +739,7 @@ static Node *basic_alt_factor(Node *t, int dir)
static Node *basic_simplify(Node *t, int dir) static Node *basic_simplify(Node *t, int dir)
{ {
if (dynamic_cast<CatNode *>(t) && if (dynamic_cast<CatNode *>(t) &&
dynamic_cast<EpsNode *>(t->child[!dir])) { &epsnode == t->child[!dir]) {
// aE -> a // aE -> a
Node *tmp = t->child[dir]; Node *tmp = t->child[dir];
t->child[dir] = NULL; t->child[dir] = NULL;