Merge pull request #4761 from WalterBright/rmSOURCE

backend: remove SOURCE_OFFSETS, SOURCE_4SYMS, SOURCE_4PARAMS
dlang · Jun 23, 2015 · 24f6c07 · 24f6c07
2 parents b9864b4 + 6a543b9
commit 24f6c07
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 25 deletions.
diff --git a/src/backend/cc.h b/src/backend/cc.h
@@ -210,9 +210,6 @@ typedef struct Srcpos
 #if M_UNIX
     short Sfilnum;              // file number
 #endif
-#if SOURCE_OFFSETS
-    unsigned long Sfiloff;      // byte offset
-#endif
 
     void print(const char *func);
 } Srcpos;
@@ -1297,10 +1294,6 @@ struct Symbol
     }_SXR;
     regm_t      Sregsaved;      // mask of registers not affected by this func
 
-#if SOURCE_4SYMS
-    Srcpos Ssrcpos;             // file position for definition
-#endif
-
     char Sident[SYM_PREDEF_SZ]; // identifier string (dynamic array)
                                 // (the size is for static Symbols)
 
@@ -1387,9 +1380,6 @@ struct PARAM
     PARAM *Pnext;               // next in list
     unsigned Pflags;
     #define PFexplicit  1       // this template argument was explicit, i.e. in < >
-#if SOURCE_4PARAMS
-    Srcpos Psrcpos;             // parameter source definition
-#endif
 
     PARAM *createTal(PARAM *);  // create template-argument-list blank from
                                 // template-parameter-list

diff --git a/src/backend/out.c b/src/backend/out.c
@@ -1483,9 +1483,6 @@ void Srcpos::print(const char *func)
     printf("Sfilptr = %p (filename = %s)", sf, sf ? sf->SFname : "null");
 #endif
     printf(", Slinnum = %u", Slinnum);
-#if SOURCE_OFFSETS
-    printf(", Sfiloff = %d", Sfiloff);
-#endif
     printf(")\n");
 }
 

diff --git a/src/backend/symbol.c b/src/backend/symbol.c
@@ -1210,9 +1210,6 @@ symbol *symbol_hydrate(symbol **ps)
         symbol_debug(s);
         if (!isdehydrated(s->Stype))    // if this symbol is already dehydrated
             return s;                   // no need to do it again
-#if SOURCE_4SYMS
-        s->Ssrcpos.Sfilnum += File_Hydrate_Num; /* file number relative header build */
-#endif
         if (pstate.SThflag != FLAG_INPLACE && s->Sfl != FLreg)
             s->Sxtrnnum = 0;            // not written to .OBJ file yet
         type_hydrate(&s->Stype);

diff --git a/src/backend/type.c b/src/backend/type.c
@@ -1477,9 +1477,6 @@ symbol *param_search(const char *name, param_t **pp)
             s->Sclass = SCparameter;
             s->Stype = p->Ptype;
             s->Stype->Tcount++;
-#if SOURCE_4PARAMS
-            s->Ssrcpos = p->Psrcpos;
-#endif
             p->Psym = s;
         }
     }
@@ -1500,9 +1497,6 @@ void param_hydrate(param_t **pp)
     {   while (*pp)
         {   assert(isdehydrated(*pp));
             p = (param_t *) ph_hydrate(pp);
-#if SOURCE_4PARAMS
-            p->Psrcpos.Sfilnum += File_Hydrate_Num;     /* file number relative header build */
-#endif
             param_debug(p);
 
             type_hydrate(&p->Ptype);

diff --git a/src/backend/type.h b/src/backend/type.h
@@ -71,9 +71,6 @@ struct TYPE
 #if 0
     unsigned short Tstabidx;    // Index into stab types
 #endif
-#if SOURCE_4TYPES
-    Srcpos Tsrcpos;             /* position of type definition */
-#endif
 #if HTOD
     Symbol *Ttypedef;           // if this type came from a typedef, this is
                                 // the typedef symbol