Current LDC frontend diff

This pull request is not meant to be merged. It is merely there
for @yebblies and others to judge the current state.

Author: dnadlinger

src/aggregate.h

@@ -121,10 +121,12 @@ class AggregateDeclaration : public ScopeDsymbol
     Prot prot();
 
     Type *handleType() { return type; } // 'this' type
+#if IN_DMD
 
     // Back end
     Symbol *stag;               // tag symbol for debug data
     Symbol *sinit;
+#endif
 
     AggregateDeclaration *isAggregateDeclaration() { return this; }
     void accept(Visitor *v) { v->visit(this); }
@@ -287,8 +289,10 @@ class ClassDeclaration : public AggregateDeclaration
 
     void addLocalClass(ClassDeclarations *);
 
+#if IN_DMD
     // Back end
     Symbol *vtblsym;
+#endif
 
     ClassDeclaration *isClassDeclaration() { return (ClassDeclaration *)this; }
     void accept(Visitor *v) { v->visit(this); }

src/argtypes.c

@@ -75,6 +75,8 @@ TypeTuple *toArgTypes(Type *t)
                 case Tfloat32:
                 case Tint64:
                 case Tuns64:
+                case Tint128:
+                case Tuns128:
                 case Tfloat64:
                 case Tfloat80:
                     t1 = t;

src/arrayop.c

@@ -34,7 +34,9 @@ Expression *buildArrayLoop(Expression *e, Parameters *fparams);
  * Hash table of array op functions already generated or known about.
  */
 
+#if IN_DMD
 AA *arrayfuncs;
+#endif
 
 /**************************************
  * Structure to contain information needed to insert an array op call
@@ -50,7 +52,6 @@ FuncDeclaration *buildArrayOp(Identifier *ident, BinExp *exp, Scope *sc, Loc loc
      *      loopbody;
      *  return p;
      */
-
     Parameter *p = (*fparams)[0];
     // foreach (i; 0 .. p.length)
     Statement *s1 = new ForeachRangeStatement(Loc(), TOKforeach,
@@ -209,7 +210,11 @@ Expression *arrayOp(BinExp *e, Scope *sc)
     char *name = buf.peekString();
     Identifier *ident = Identifier::idPool(name);
 
+#if IN_LLVM
+    FuncDeclaration **pFd = (FuncDeclaration **)dmd_aaGet(&sc->module->arrayfuncs, (void *)ident);
+#else    
     FuncDeclaration **pFd = (FuncDeclaration **)dmd_aaGet(&arrayfuncs, (void *)ident);
+#endif
     FuncDeclaration *fd = *pFd;
 
     if (!fd)

src/attrib.c

@@ -29,6 +29,9 @@
 #include "parse.h"
 #include "template.h"
 #include "utf.h"
+#if IN_LLVM
+#include "../gen/pragma.h"
+#endif
 
 
 /********************************* AttribDeclaration ****************************/
@@ -820,6 +823,11 @@ void PragmaDeclaration::semantic(Scope *sc)
 {
     // Should be merged with PragmaStatement
 
+#if IN_LLVM
+    Pragma llvm_internal = LLVMnone;
+    std::string arg1str;
+#endif
+
     //printf("\tPragmaDeclaration::semantic '%s'\n",toChars());
     if (ident == Id::msg)
     {
@@ -997,6 +1005,12 @@ void PragmaDeclaration::semantic(Scope *sc)
         }
 #endif
     }
+#if IN_LLVM
+    else if ((llvm_internal = DtoGetPragma(sc, this, arg1str)) != LLVMnone)
+    {
+        // nothing to do anymore
+    }
+#endif
     else if (global.params.ignoreUnsupportedPragmas)
     {
         if (global.params.verbose)
@@ -1009,7 +1023,11 @@ void PragmaDeclaration::semantic(Scope *sc)
                 for (size_t i = 0; i < args->dim; i++)
                 {
                     Expression *e = (*args)[i];
-
+#if IN_LLVM
+                    // ignore errors in ignored pragmas.
+                    global.gag++;
+                    unsigned errors_save = global.errors;
+#endif
                     sc = sc->startCTFE();
                     e = e->semantic(sc);
                     e = resolveProperties(sc, e);
@@ -1021,13 +1039,17 @@ void PragmaDeclaration::semantic(Scope *sc)
                     else
                         fprintf(global.stdmsg, ",");
                     fprintf(global.stdmsg, "%s", e->toChars());
+#if IN_LLVM
+                    // restore error state.
+                    global.gag--;
+                    global.errors = errors_save;
+#endif
                 }
                 if (args->dim)
                     fprintf(global.stdmsg, ")");
             }
             fprintf(global.stdmsg, "\n");
         }
-        goto Lnodecl;
     }
     else
         error("unrecognized pragma(%s)", ident->toChars());
@@ -1055,6 +1077,13 @@ void PragmaDeclaration::semantic(Scope *sc)
                         error("can only apply to a single declaration");
                 }
             }
+#if IN_LLVM
+            else
+            {
+                DtoCheckPragma(this, s, llvm_internal, arg1str);
+            }
+#endif
+
         }
     }
     return;