shithub: mc

Download patch

ref: 11f9444f151e18547c277027ff39f81c5976318f
parent: a89326287764981cafb8d06c30c8f57e65d9f6fa
author: Ori Bernstein <[email protected]>
date: Mon Sep 28 20:38:29 EDT 2015 

Storing the visibility caused a regression.

    Reverting until I can think more about it.


--- a/parse/stab.c
+++ b/parse/stab.c
@@ -373,9 +373,6 @@
 
 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)
@@ -382,8 +379,6 @@
         *new = *old;
     else
         return 0;
-    old->vis = vis;
-    new->vis = vis;
     return 1;
 }
 
@@ -408,9 +403,6 @@
 
 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)
@@ -417,8 +409,6 @@
         *new = *old;
     else
         return 0;
-    old->impl.vis = vis;
-    new->impl.vis = vis;
     return 1;
 }