WIP: Hack away special cases for *naked* DMD-style inline asm

Author: kinke

gen/asm-x86.h

@@ -2340,7 +2340,7 @@ struct AsmProcessor {
                   AsmCode *asmcode, AsmArgMode mode = Mode_Input) {
     using namespace dmd;
 
-    if (sc->func->isNaked()) {
+    if (false && sc->func->isNaked()) {
       switch (type) {
       case Arg_Integer:
         if (e->type->isUnsigned()) {
@@ -2392,16 +2392,28 @@ struct AsmProcessor {
         llvm_unreachable("Unsupported argument in asm.");
         break;
       }
-    } else {
-      insnTemplate << fmt << "<<" << (mode == Mode_Input ? "in" : "out")
-                   << asmcode->args.size() << ">>";
-      asmcode->args.push_back(AsmArg(type, e, mode));
+    } else { // non-naked
+      if (type == Arg_Integer) {
+        if (e->type->isUnsigned()) {
+          insnTemplate << "$$" << e->toUInteger();
+        } else {
+#ifndef ASM_X86_64
+          insnTemplate << "$$" << static_cast<sinteger_t>(e->toInteger());
+#else
+          insnTemplate << "$$" << e->toInteger();
+#endif
+        }
+      } else {
+        insnTemplate << fmt << "<<" << (mode == Mode_Input ? "in" : "out")
+                    << asmcode->args.size() << ">>";
+        asmcode->args.push_back(AsmArg(type, e, mode));
+      }
     }
   }
   void addOperand2(const char *fmtpre, const char *fmtpost, AsmArgType type,
                    Expression *e, AsmCode *asmcode,
                    AsmArgMode mode = Mode_Input) {
-    if (sc->func->isNaked()) {
+    if (false && sc->func->isNaked()) {
       // taken from above
       error(stmt->loc, "only global variables can be referenced by identifier in "
                   "naked asm");
@@ -3081,7 +3093,7 @@ struct AsmProcessor {
               // (Only for non-naked asm, as this isn't an issue for naked asm.)
               //
               // See also: https://lists.llvm.org/pipermail/llvm-dev/2017-August/116244.html
-              const auto forceLeadingDisplacement = hasConstDisplacement && !sc->func->isNaked();
+              const auto forceLeadingDisplacement = hasConstDisplacement;// && !sc->func->isNaked();
               if (forceLeadingDisplacement) {
                 // Subtract 8 from our const-displacement, and prepare to add the 8 from the `H` modifier.
                 insnTemplate << "-8+";
@@ -3092,7 +3104,7 @@ struct AsmProcessor {
                 use_star = false;
               }
 
-              if (!sc->func->isNaked()) // no addrexp in naked asm please :)
+              if (true || !sc->func->isNaked()) // no addrexp in naked asm please :)
               {
                 Type *tt = pointerTo(e->type);
                 e = createAddrExp(Loc(), e);

gen/asmstmt.cpp

@@ -538,6 +538,7 @@ void CompoundAsmStatement_toIR(CompoundAsmStatement *stmt, IRState *p) {
         continue;
       }
 
+      /*
       // if we already set things up for this branch target, skip
       if (gotoToVal.find(targetLabel) != gotoToVal.end()) {
         continue;
@@ -561,6 +562,7 @@ void CompoundAsmStatement_toIR(CompoundAsmStatement *stmt, IRState *p) {
       code << asmGotoEnd;
 
       ++n_goto;
+      */
     }
     if (code.str() != asmGotoEnd) {
       // finalize code

gen/functions.cpp

@@ -773,10 +773,8 @@ static LinkageWithCOMDAT lowerFuncLinkage(FuncDeclaration *fdecl) {
     return LinkageWithCOMDAT(LLGlobalValue::ExternalLinkage, false);
   }
 
-  // A body-less declaration always needs to be marked as external in LLVM
-  // (also e.g. naked template functions which would otherwise be weak_odr,
-  // but where the definition is in module-level inline asm).
-  if (!fdecl->fbody || fdecl->isNaked()) {
+  // A body-less declaration always needs to be marked as external in LLVM.
+  if (!fdecl->fbody) {
     return LinkageWithCOMDAT(LLGlobalValue::ExternalLinkage, false);
   }
 

tests/codegen/naked_asm_output.d

@@ -106,4 +106,4 @@ int instantiate1() {
 }
 
 // Verify naked attribute is present in attributes group
-// IR: attributes #[[ATTRS]] = {{{.*}}naked{{.*}}noinline{{.*}}nounwind{{.*}}optnone
+// IR: attributes #[[ATTRS]] = {{{.*}}naked{{.*}}noinline