summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2015-09-29 00:38:29 -0700
committerOri Bernstein <ori@eigenstate.org>2015-09-29 00:38:29 -0700
commit11f9444f151e18547c277027ff39f81c5976318f (patch)
treec05608113945733eca61ef3ea856a7b536f386b7
parenta89326287764981cafb8d06c30c8f57e65d9f6fa (diff)
downloadmc-11f9444f151e18547c277027ff39f81c5976318f.tar.gz
Storing the visibility caused a regression.
Reverting until I can think more about it.
-rw-r--r--parse/stab.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/parse/stab.c b/parse/stab.c
index 8e273ab..a17efeb 100644
--- a/parse/stab.c
+++ b/parse/stab.c
@@ -373,17 +373,12 @@ void putucon(Stab *st, Ucon *uc)
static int mergetrait(Trait *old, Trait *new)
{
- Vis vis;
-
- vis = max(old->vis, new->vis);
if (old->isproto && !new->isproto)
*old = *new;
else if (new->isproto && !old->isproto)
*new = *old;
else
return 0;
- old->vis = vis;
- new->vis = vis;
return 1;
}
@@ -408,17 +403,12 @@ void puttrait(Stab *st, Node *n, Trait *c)
static int mergeimpl(Node *old, Node *new)
{
- Vis vis;
-
- vis = max(old->impl.vis, new->impl.vis);
if (old->impl.isproto && !new->impl.isproto)
*old = *new;
else if (new->impl.isproto && !old->impl.isproto)
*new = *old;
else
return 0;
- old->impl.vis = vis;
- new->impl.vis = vis;
return 1;
}