# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1233681099 -3600
# Node ID 0749c0757a43d4189fb5e3da1b3978244da88d8f
# Parent  75c53f8f67a4bf42f12fc4c006029abbe6243500
Apply naked changes of [920] to dmd2/

diff -r 75c53f8f67a4 -r 0749c0757a43 dmd2/declaration.c
--- a/dmd2/declaration.c	Tue Feb 03 18:00:17 2009 +0100
+++ b/dmd2/declaration.c	Tue Feb 03 18:11:39 2009 +0100
@@ -619,6 +619,7 @@
     // LDC
     anonDecl = NULL;
     offset2 = 0;
+    nakedUse = false;
 }
 
 Dsymbol *VarDeclaration::syntaxCopy(Dsymbol *s)
diff -r 75c53f8f67a4 -r 0749c0757a43 dmd2/declaration.h
--- a/dmd2/declaration.h	Tue Feb 03 18:00:17 2009 +0100
+++ b/dmd2/declaration.h	Tue Feb 03 18:11:39 2009 +0100
@@ -280,6 +280,7 @@
     // LDC
     AnonDeclaration* anonDecl;
     unsigned offset2;
+    bool nakedUse;
 };
 
 /**************************************************************/
diff -r 75c53f8f67a4 -r 0749c0757a43 dmd2/mars.c
--- a/dmd2/mars.c	Tue Feb 03 18:00:17 2009 +0100
+++ b/dmd2/mars.c	Tue Feb 03 18:11:39 2009 +0100
@@ -912,7 +912,7 @@
         global.params.cpu = ARCHthumb;
     }
     else {
-        assert(0 && "Invalid arch");
+        error("invalid cpu architecture specified: %s", global.params.llvmArch); 
     }
 
     assert(global.params.cpu != ARCHinvalid);
diff -r 75c53f8f67a4 -r 0749c0757a43 dmd2/statement.h
--- a/dmd2/statement.h	Tue Feb 03 18:00:17 2009 +0100
+++ b/dmd2/statement.h	Tue Feb 03 18:11:39 2009 +0100
@@ -162,6 +162,9 @@
     // Back end
     virtual void toIR(IRState *irs);
 
+    // LDC
+    virtual void toNakedIR(IRState *irs);
+
     // Avoid dynamic_cast
     virtual DeclarationStatement *isDeclarationStatement() { return NULL; }
     virtual CompoundStatement *isCompoundStatement() { return NULL; }
@@ -187,6 +190,9 @@
     Statement *inlineScan(InlineScanState *iss);
 
     void toIR(IRState *irs);
+
+    // LDC
+    virtual void toNakedIR(IRState *irs);
 };
 
 struct CompileStatement : Statement
@@ -237,6 +243,9 @@
 
     virtual void toIR(IRState *irs);
 
+    // LDC
+    virtual void toNakedIR(IRState *irs);
+
     virtual CompoundStatement *isCompoundStatement() { return this; }
 };
 
@@ -879,6 +888,7 @@
 
     // LDC
     bool asmLabel;       // for labels inside inline assembler
+    virtual void toNakedIR(IRState *irs);
 };
 
 struct LabelDsymbol : Dsymbol
@@ -912,6 +922,8 @@
     // LDC
     // non-zero if this is a branch, contains the target labels identifier
     Identifier* isBranchToLabel;
+
+    virtual void toNakedIR(IRState *irs);
 };
 
 struct AsmBlockStatement : CompoundStatement
@@ -928,6 +940,7 @@
     AsmBlockStatement *isAsmBlockStatement() { return this; }
 
     void toIR(IRState *irs);
+    virtual void toNakedIR(IRState *irs);
 };
 
 #endif /* DMD_STATEMENT_H */