Also move nakedUse from VarDeclaration to IrGlobal

ldc-developers · Oct 5, 2014 · 6864988 · 6864988
1 parent bb496e8
commit 6864988
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/dmd2/declaration.c b/dmd2/declaration.c
@@ -946,7 +946,6 @@ VarDeclaration::VarDeclaration(Loc loc, Type *type, Identifier *id, Initializer
     edtor = NULL;
     range = NULL;
 #if IN_LLVM
-    nakedUse = false;
 #endif
 }
 

diff --git a/dmd2/declaration.h b/dmd2/declaration.h
@@ -341,8 +341,6 @@ class VarDeclaration : public Declaration
     void accept(Visitor *v) { v->visit(this); }
 
 #if IN_LLVM
-    /// This var is used by a naked function.
-    bool nakedUse;
 #endif
 };
 

diff --git a/gen/asm-x86.h b/gen/asm-x86.h
@@ -2227,7 +2227,7 @@ namespace AsmParserx8664
 
                                 // print out the mangle
                                 insnTemplate << mangle(vd);
-                                vd->nakedUse = true;
+                                getIrGlobal(vd, true)->nakedUse = true;
                                 break;
                             }
                         }

diff --git a/gen/declarations.cpp b/gen/declarations.cpp
@@ -286,7 +286,7 @@ class CodegenVisitor : public Visitor {
             // If this global is used from a naked function, we need to create an
             // artificial "use" for it, or it could be removed by the optimizer if
             // the only reference to it is in inline asm.
-            if (decl->nakedUse)
+            if (irGlobal->nakedUse)
                 irs->usedArray.push_back(DtoBitCast(gvar, getVoidPtrType()));
 
             IF_LOG Logger::cout() << *gvar << '\n';

diff --git a/ir/irvar.h b/ir/irvar.h
@@ -51,12 +51,15 @@ struct IrVar
 struct IrGlobal : IrVar
 {
     IrGlobal(VarDeclaration* v)
-        : IrVar(v), type(0), constInit(0) { }
+        : IrVar(v), type(0), constInit(0), nakedUse(false) { }
     IrGlobal(VarDeclaration* v, llvm::Type *type, llvm::Constant* constInit = 0)
-        : IrVar(v), type(type), constInit(constInit) { }
+        : IrVar(v), type(type), constInit(constInit), nakedUse(false) { }
 
     llvm::Type *type;
     llvm::Constant* constInit;
+
+    // This var is used by a naked function.
+    bool nakedUse;
 };
 
 // represents a local variable variable